OSDN Git Service
Nicolas Roard [Fri, 4 Mar 2011 09:23:59 +0000 (01:23 -0800)]
am
4ffd02f8: am
8519dcd5: (-s ours) DO NOT MERGE : Cherry-pick of change I9942e8e4 from master
* commit '
4ffd02f8c673bc6ce1a6b96f9fd3b21e8337ec7c':
DO NOT MERGE : Cherry-pick of change I9942e8e4 from master
Nicolas Roard [Fri, 4 Mar 2011 09:21:43 +0000 (01:21 -0800)]
am
8519dcd5: (-s ours) DO NOT MERGE : Cherry-pick of change I9942e8e4 from master
* commit '
8519dcd53eb4325b8d2d76c030d0af4503472df7':
DO NOT MERGE : Cherry-pick of change I9942e8e4 from master
Ed Heyl [Fri, 4 Mar 2011 05:49:08 +0000 (21:49 -0800)]
Merge branch 'master' into honeycomb-plus-aosp
Derek Sollenberger [Thu, 3 Mar 2011 22:00:11 +0000 (14:00 -0800)]
Merge "ensure plugins draw correctly even when they have been given focus." into honeycomb-mr1
Derek Sollenberger [Thu, 3 Mar 2011 20:13:18 +0000 (15:13 -0500)]
ensure plugins draw correctly even when they have been given focus.
The initial attempt at fixing this bug was to modify the clip, but
this was not correct and only fixed cases where the plugin was on
the left edge of the screen. This CL properly adjusts the plugin's
boundaries to make sure the content is drawn in the appropriate
position.
bug:
3477581
Change-Id: I5958228a93fa5600cd7e24ed9e7e1e26f6b241bc
Nicolas Roard [Thu, 3 Mar 2011 18:16:31 +0000 (10:16 -0800)]
Do not merge: Cherry-pick change I9942e8e4 from master
Wait the remaining of the 60FPS cap delay rather than not paint.
Returning true if called faster than 60FPS means
we are not drawing and ask for the framework to call
us again; this works in general because the framework recopy
the previous framebuffer. But in some cases, it didn't, causing
the webview to flicker. A correct fix would be to introduce
the capping in framework rather than try to doing it in the
webview; in the meantime we will sleep the remaining of the delay
as a workaround, so that we still provide the GPU
benefits we wanted (at >60FPS the GPU was being saturated in
some cases).
bug:
3500655
Change-Id: Ibaa1d93e0a13433a2c842b19b58538894fdaa7e4
Nicolas Roard [Thu, 3 Mar 2011 18:16:31 +0000 (10:16 -0800)]
DO NOT MERGE : Cherry-pick of change I9942e8e4 from master
Wait the remaining of the 60FPS cap delay rather than not paint.
Returning true if called faster than 60FPS means
we are not drawing and ask for the framework to call
us again; this works in general because the framework recopy
the previous framebuffer. But in some cases, it didn't, causing
the webview to flicker. A correct fix would be to introduce
the capping in framework rather than try to doing it in the
webview; in the meantime we will sleep the remaining of the delay
as a workaround, so that we still provide the GPU
benefits we wanted (at >60FPS the GPU was being saturated in
some cases).
bug:
3500655
Change-Id: Iae50737b6d3202a8a0d3ec6d4a5261fe1b6d1b3f
Steve Block [Thu, 3 Mar 2011 12:55:39 +0000 (04:55 -0800)]
Merge "Avoid Android modifications to JavaNPObjectV8.cpp/h"
Derek Sollenberger [Thu, 3 Mar 2011 06:27:27 +0000 (22:27 -0800)]
am
1a2d40c0: (-s ours) am
b715a7c4: Do not merge: Cherry-pick change I21555e92 from master
* commit '
1a2d40c0fc6710c8ccefb3779b3f9c04c6e43ef5':
Do not merge: Cherry-pick change I21555e92 from master
Derek Sollenberger [Thu, 3 Mar 2011 02:26:16 +0000 (18:26 -0800)]
am
b715a7c4: Do not merge: Cherry-pick change I21555e92 from master
* commit '
b715a7c48aa637ebc2832775ea04567c915f6296':
Do not merge: Cherry-pick change I21555e92 from master
Derek Sollenberger [Wed, 2 Mar 2011 21:33:19 +0000 (16:33 -0500)]
Do not merge: Cherry-pick change I21555e92 from master
Bug:
3471680
Enable the plugin to specify the BGRA internal format for textures.
Change-Id: Ied336c0a2309d14033a065b74e675d6d4405551b
Bart Sears [Wed, 2 Mar 2011 23:35:34 +0000 (15:35 -0800)]
Merge "Enable the plugin to specify the BGRA internal format for textures."
Derek Sollenberger [Wed, 2 Mar 2011 21:33:19 +0000 (16:33 -0500)]
Enable the plugin to specify the BGRA internal format for textures.
Change-Id: I21555e923ba6ac6c2bcd291ffa73a1aa087bdb3b
Derek Sollenberger [Wed, 2 Mar 2011 21:03:09 +0000 (13:03 -0800)]
Merge "Ensure plugin content does not shift when gaining focus."
Derek Sollenberger [Wed, 2 Mar 2011 20:53:43 +0000 (12:53 -0800)]
am
959e9dbc: (-s ours) am
2764765b: Do not merge: Cherry-pick fix to framerate cap
* commit '
959e9dbc6321a6dafa3f419e67459e50ea29bc14':
Do not merge: Cherry-pick fix to framerate cap
Derek Sollenberger [Wed, 2 Mar 2011 20:44:58 +0000 (15:44 -0500)]
Ensure plugin content does not shift when gaining focus.
bug:
3477581
Change-Id: Ia7bbaaca405db33dbefaa8f6f00e9250580e5f7b
Nicolas Roard [Wed, 2 Mar 2011 19:04:40 +0000 (11:04 -0800)]
Merge "Fix Browser ANR"
Nicolas Roard [Tue, 1 Mar 2011 20:46:27 +0000 (12:46 -0800)]
Fix Browser ANR
The dtor of GLWebViewState is calling the dtor of its TiledPage
variables; the dtor of TiledPage wait until any pending painting
operations running in the TextureGenerator thread are done. The painting
operations ultimately paint using the current GLWebViewState's base
layer. We were doing unref() on the baselayer before destroying the
TiledPage...
bug:
3429924
Change-Id: I685e7fca5e5bae796f808debbf7e4ce668b83e6b
Leon Scroggins [Wed, 2 Mar 2011 17:31:51 +0000 (09:31 -0800)]
Merge "New assets for checkboxes and radio buttons."
Steve Block [Wed, 2 Mar 2011 17:26:25 +0000 (17:26 +0000)]
Avoid Android modifications to JavaNPObjectV8.cpp/h
https://android-git.corp.google.com/g/40387 fixed a long-standing bug to
avoid leaking references to injected Java objects. However, it did so by
making changes to JavaNPObjectV8.cpp/h which were never upstreamed. This
change avoids the need for these changes.
This change also avoids the use of a local PassRefPtr, which was
incorrectly introduced in https://android-git.corp.google.com/g/36204.
Change-Id: I6b17e85f7991e5226e00e7b041c38e2ca3d0cf57
Leon Scroggins [Wed, 2 Mar 2011 16:27:04 +0000 (11:27 -0500)]
New assets for checkboxes and radio buttons.
Bug:
3009375
Requires a change to frameworks/base.
Change-Id: I444d44c92fbf5fb3621fb39bfc7582a2ec987ce5
Cary Clark [Wed, 2 Mar 2011 14:34:43 +0000 (09:34 -0500)]
check for stacking context before scrolling layer
It doesn't make sense to scroll without a stacking
context.
bug:
3494970
Change-Id: I59e951b3688aa21f5c99b16a953b6620b501442c
Cary Clark [Wed, 2 Mar 2011 12:54:56 +0000 (04:54 -0800)]
Merge "disable nodes that are completely clipped out"
Ben Murdoch [Wed, 2 Mar 2011 10:18:03 +0000 (02:18 -0800)]
Merge "Crash on GL OOM to stop fallback to SW rendering."
Ben Murdoch [Wed, 2 Mar 2011 10:17:00 +0000 (02:17 -0800)]
Merge "Revert "Work around for pure virtual layers crash.""
Derek Sollenberger [Tue, 1 Mar 2011 21:49:43 +0000 (13:49 -0800)]
am
2764765b: Do not merge: Cherry-pick fix to framerate cap
* commit '
2764765b1eae36aff2deaec49a1589aeb636ee1d':
Do not merge: Cherry-pick fix to framerate cap
Kristian Monsen [Tue, 1 Mar 2011 21:12:31 +0000 (13:12 -0800)]
Merge "Part bug
3489551 Browser doesn't send cookies for HTML5 video in incognito"
Cary Clark [Tue, 1 Mar 2011 21:09:18 +0000 (16:09 -0500)]
disable nodes that are completely clipped out
If clipping a node's cursor rings results in all of the
rings going away, mark the node as disabled, and find a new
node.
bug:
3500759
Change-Id: Ie633b06de948ea0e1805598b0e8321f1f9863dc2
Derek Sollenberger [Tue, 1 Mar 2011 14:23:53 +0000 (09:23 -0500)]
Do not merge: Cherry-pick fix to framerate cap
Bug:
3471680
Fix framerate cap when multiple webviews exist.
Each view will now be capped at 60fps. The previous code would
either starve the drawing of additional webviews or would draw
them at a rate of 60fps/N where N is the number of webviews.
Change-Id: I359a79f5981bc29d57ce4b94eb00a5c9aee754d0
Kristian Monsen [Tue, 1 Mar 2011 20:10:09 +0000 (20:10 +0000)]
Part bug
3489551 Browser doesn't send cookies for HTML5 video in incognito
Added private mode variable for some cookie methods.
Needs following CL in frameworks/base:
https://android-git.corp.google.com/g/#change,99052
Change-Id: I158b5456d60b321be4264f130d39e4b444bfba47
John Reck [Tue, 1 Mar 2011 18:17:13 +0000 (10:17 -0800)]
Merge "Only support saveWebArchive for (X)HTML"
Kristian Monsen [Tue, 1 Mar 2011 18:08:41 +0000 (10:08 -0800)]
Merge "Part of fix for bug
3317722 User Trial: Browser stuck loading pages - IKXEVEREST-2628"
Kristian Monsen [Tue, 1 Mar 2011 17:01:17 +0000 (17:01 +0000)]
Part of fix for bug
3317722 User Trial: Browser stuck loading pages - IKXEVEREST-2628
Preserving original mime type when no new type is found for type
application/octet-stream or text/plain
Change-Id: Id98d4c4faef599e14ba5e1789700932ab55729de
Nicolas Roard [Mon, 28 Feb 2011 22:05:24 +0000 (14:05 -0800)]
GL perfs measurement
Change-Id: Id6e0b8199f82c44de0e7b1b7e7eb42bdb96bf908
Derek Sollenberger [Tue, 1 Mar 2011 15:39:54 +0000 (07:39 -0800)]
Merge "Fix framerate cap when multiple webviews exist."
Kristian Monsen [Tue, 1 Mar 2011 14:42:28 +0000 (06:42 -0800)]
Merge "Fix warning"
Kristian Monsen [Tue, 1 Mar 2011 11:46:07 +0000 (11:46 +0000)]
Fix warning
Change-Id: Ifb290ab8e027b1828c1c10ca3ee70eadedf23f66
Derek Sollenberger [Tue, 1 Mar 2011 14:23:53 +0000 (09:23 -0500)]
Fix framerate cap when multiple webviews exist.
Each view will now be capped at 60fps. The previous code would
either starve the drawing of additional webviews or would draw
them at a rate of 60fps/N where N is the number of webviews.
Change-Id: I5698d610b17d4c8cfe137c51c2b978dae04ae1cf
Derek Sollenberger [Tue, 1 Mar 2011 13:19:47 +0000 (05:19 -0800)]
Merge "Add support for plugins to use incognito mode."
Ben Murdoch [Tue, 1 Mar 2011 10:08:54 +0000 (02:08 -0800)]
Merge changes I7d73cc44,I610ebdbc
* changes:
Merge WebKit at Chromium 9.0.597.107: Update WebKit merge revision
Merge WebKit at Chromium 9.0.597.107: Initial merge by git.
Nicolas Roard [Tue, 1 Mar 2011 06:23:43 +0000 (22:23 -0800)]
am
17ed9cd4: am
7571a1f2: Cap framerate at 60fps
* commit '
17ed9cd411dd026b58faa85f77cf63c25eee4883':
Cap framerate at 60fps
John Reck [Tue, 1 Mar 2011 00:17:28 +0000 (16:17 -0800)]
Only support saveWebArchive for (X)HTML
Bug:
3492152
If the mimetype is not text/html or application/xhtml+xml, don't
try to save the page as a web archive and instead return NULL
Change-Id: Ieb9d65efd72392bedec41ba33ae2aeb1a0954bb4
Nicolas Roard [Mon, 28 Feb 2011 22:47:15 +0000 (14:47 -0800)]
am
7571a1f2: Cap framerate at 60fps
* commit '
7571a1f293987b3cbe0b393968b163d5ece2bd64':
Cap framerate at 60fps
Nicolas Roard [Mon, 28 Feb 2011 17:58:49 +0000 (09:58 -0800)]
Cap framerate at 60fps
bug:
3471680
Change-Id: Ia19c4402858b758312c1f801bda990275f970b63
Nicolas Roard [Mon, 28 Feb 2011 17:58:49 +0000 (09:58 -0800)]
Cap framerate at 60fps
Change-Id: I1b6be15a38d2afc55659872b82e13ebcd8fd2ada
Ben Murdoch [Mon, 28 Feb 2011 17:48:07 +0000 (17:48 +0000)]
Merge WebKit at Chromium 9.0.597.107: Update WebKit merge revision
Note that we are tracking the Chromium 9.0.597 release branch,
which is WebKit r72805 + stability cherry picks.
This corresponds to r78920 on the 597 release branch.
Change-Id: I7d73cc447de8511b956a75d8acb1379c21ab266e
Ben Murdoch [Mon, 28 Feb 2011 17:44:23 +0000 (17:44 +0000)]
Merge WebKit at Chromium 9.0.597.107: Initial merge by git.
Note that we are tracking the Chromium 9.0.597 release branch,
which is WebKit r72805 + stability cherry picks.
This corresponds to r78920 on the 597 release branch.
Change-Id: I610ebdbcba92cfa788b229ee207a405789d45e67
Ben Murdoch [Mon, 28 Feb 2011 13:57:18 +0000 (13:57 +0000)]
Crash on GL OOM to stop fallback to SW rendering.
If we detect an OOM from GL, crash the process to stop the
framework falling back to software rendering. The framework will
not enable HW rendering again until the process is killed and
Flash does not work with software rendering.
Bug:
3477085
Change-Id: I8defebbe3ea281c342fc99ace8638c347a3eb246
Derek Sollenberger [Fri, 25 Feb 2011 15:34:46 +0000 (10:34 -0500)]
Add support for plugins to use incognito mode.
bug:
2968415
Change-Id: Ie67c9f6b28a81d4a65f39bde2896078d7b49b8ee
Leon Scroggins [Fri, 25 Feb 2011 19:50:57 +0000 (14:50 -0500)]
Allow a site to specify to not show the IME for a textfield.
Bug:
3391139
Change-Id: Ic1c99750c9e91940d9ac628444be594f5f860748
Leon Scroggins [Fri, 25 Feb 2011 20:58:18 +0000 (12:58 -0800)]
Merge "Use UI side scrolling for readOnly textareas."
Leon Scroggins [Fri, 25 Feb 2011 20:54:52 +0000 (15:54 -0500)]
Use UI side scrolling for readOnly textareas.
Bug:
3300760
Change-Id: I44641bb4ba385ece2ace9f8dba2205b76e755289
Nicolas Roard [Fri, 25 Feb 2011 20:37:56 +0000 (12:37 -0800)]
Merge "Clean up synchronisation in Texture code."
Patrick Scott [Fri, 25 Feb 2011 19:42:01 +0000 (11:42 -0800)]
Merge "Fix frameset expansion."
Ben Murdoch [Thu, 24 Feb 2011 16:42:27 +0000 (16:42 +0000)]
Clean up synchronisation in Texture code.
Ensure that we wait in a while loop checking the condition when
we call wait, and only signal after unlocking the Mutex.
Also removes mNewRequest lock and condition in the TexturesGenerator
as it doesn't seem to be needed.
Hopefully this will clear up some ANRs.
Change-Id: I1b8b103a6effd2aa678a304e2519a6f6c484aaad
Patrick Scott [Thu, 17 Feb 2011 15:58:02 +0000 (10:58 -0500)]
Fix frameset expansion.
Do not expand frames that cannot scroll. Use contentsWidth and contentsHeight
instead of exposing docWidth. Trigger a layout of the parent if the FrameView's
layout reveals a larger content dimension. Remove iframe flattening code.
Bug:
3370518
Bug:
3323913
Change-Id: I60e89caf335bfaf271f90ffd538c65f3735572da
Leon Scroggins [Fri, 25 Feb 2011 18:01:39 +0000 (10:01 -0800)]
Merge "Use an appropriate parameter for revealSelection."
Russell Brenner [Fri, 25 Feb 2011 17:33:53 +0000 (09:33 -0800)]
Merge "Fixed
3425519, misalignment with fixed width font"
Leon Scroggins [Thu, 24 Feb 2011 19:33:16 +0000 (14:33 -0500)]
Use an appropriate parameter for revealSelection.
Bug:
3367446
The default ScrollAlignment for revealSelection results
in attempting to scroll to a negative scroll position in
y.
Change-Id: I482d6dbe2e91e3eba24036b8acf4a0c13a6a2c7e
Kristian Monsen [Fri, 25 Feb 2011 14:21:35 +0000 (06:21 -0800)]
Merge "Possible fix for bug
3410366 SEGV in when hitting "go back" on an ssl cert warning"
Nicolas Roard [Fri, 25 Feb 2011 00:34:26 +0000 (16:34 -0800)]
am
48a84519: (-s ours) am
31cf3287: Do not merge: Cherry-pick CL to help flash plugin performance
* commit '
48a84519fe5415339de288d11f43a71fb3ca6c28':
Do not merge: Cherry-pick CL to help flash plugin performance
Nicolas Roard [Fri, 25 Feb 2011 00:32:11 +0000 (16:32 -0800)]
am
31cf3287: Do not merge: Cherry-pick CL to help flash plugin performance
* commit '
31cf3287137bf5e5c4c120c731ba886e2be1eb24':
Do not merge: Cherry-pick CL to help flash plugin performance
Nicolas Roard [Fri, 25 Feb 2011 00:14:33 +0000 (16:14 -0800)]
Do not merge: Cherry-pick CL to help flash plugin performance
Add a glFinish() at the end of drawGL(), to help
the GPU and the flash plugin...
bug:
3471680
Change-Id: I309e0ba13f0b51b08b762de39b47b2b409faeacc
Nicolas Roard [Fri, 25 Feb 2011 00:19:01 +0000 (16:19 -0800)]
Merge "Add a glFinish() at the end of drawGL(), to help the GPU and the flash plugin..."
Russell Brenner [Thu, 24 Feb 2011 23:45:59 +0000 (15:45 -0800)]
Fixed
3425519, misalignment with fixed width font
Uses new skia api to identify fixed width fonts. Without this fix, all
Android fonts were reported as variable width, causing layout
adjustment of whitespace. Now that fixed width fonts are properly
reported, space characters preserve the same width as non-space chars.
Change-Id: I7d83481f44e6c34fd8ae5c6638b1625d3a83a637
Nicolas Roard [Fri, 25 Feb 2011 00:14:33 +0000 (16:14 -0800)]
Add a glFinish() at the end of drawGL(), to help
the GPU and the flash plugin...
bug:
3471680
Change-Id: I436de6caea4dd5b1171f260d328dfe8170463832
Derek Sollenberger [Thu, 24 Feb 2011 23:56:55 +0000 (15:56 -0800)]
am
04cd60b1: (-s ours) am
13427c01: Do not merge: cherry-pick incorect clip CL from master
* commit '
04cd60b14091f375070bd41ec748ece31777b00b':
Do not merge: cherry-pick incorect clip CL from master
Derek Sollenberger [Thu, 24 Feb 2011 23:54:46 +0000 (15:54 -0800)]
am
13427c01: Do not merge: cherry-pick incorect clip CL from master
* commit '
13427c01ee4c0f85b8baabb2294fb527013acfc2':
Do not merge: cherry-pick incorect clip CL from master
Derek Sollenberger [Thu, 24 Feb 2011 21:17:51 +0000 (16:17 -0500)]
Do not merge: cherry-pick incorect clip CL from master
Fix problem where plugins were not drawn due to an incorrect clip.
bug:
3451982
Change-Id: I9eaaa218afa1a386dcb89d1d7845f80b0b180959
Bart Sears [Thu, 24 Feb 2011 23:15:01 +0000 (15:15 -0800)]
Merge "Fix problem where plugins were not drawn due to an incorrect clip."
Teng-Hui Zhu [Thu, 24 Feb 2011 22:40:41 +0000 (14:40 -0800)]
Merge "revert "Enable layers for fixed elements only for mobile websites""
Teng-Hui Zhu [Thu, 24 Feb 2011 22:31:27 +0000 (14:31 -0800)]
Merge "Update fixed layer at sync time."
Teng-Hui Zhu [Thu, 24 Feb 2011 01:10:23 +0000 (17:10 -0800)]
revert "Enable layers for fixed elements only for mobile websites"
revert #change,93656
Now we will use layer for fixed element in desktop site, too.
Change-Id: I0a86d46f86fa75b704286aa613e967108851b990
Teng-Hui Zhu [Thu, 24 Feb 2011 21:40:37 +0000 (13:40 -0800)]
Update fixed layer at sync time.
For the example of google news, one of the fixed position layer is under
another fixed layer, and it is not updated for scrolling.
The CSS value did change, but we don't have a updated fixed position call.
Moving the update to sync time fix this issue.
bug:
3486524
Change-Id: Iecb65b37d06e65902511e569238546b49b1dcd47
Kristian Monsen [Thu, 24 Feb 2011 17:10:40 +0000 (17:10 +0000)]
Possible fix for bug
3410366 SEGV in when hitting "go back" on an ssl cert warning
RefCounting the handle that is sent to webkit (and java). Note
that if java does not call back with either cancel or proceed it
will leak. The documentation for in WebViewClient.java says:
Notify the host application to handle a ssl certificate error request
(display the error to the user and ask whether to proceed or not). The
host application has to call either handler.cancel() or handler.proceed()
as the connection is suspended and waiting for the response. The default
behavior is to cancel the load.
This means it is clearly an error not to call any of them, and leaking
in that case is OK.
Change-Id: Idac713833395edfbec3ae9b5612a34c2cf25f4e7
Derek Sollenberger [Thu, 24 Feb 2011 21:17:51 +0000 (16:17 -0500)]
Fix problem where plugins were not drawn due to an incorrect clip.
bug:
3451982
Change-Id: If1d7bff729f72c28fec4905c3525b2f2ac1c6475
Derek Sollenberger [Thu, 24 Feb 2011 21:12:02 +0000 (13:12 -0800)]
Merge "Only show video texture when frames are available."
Cary Clark [Thu, 24 Feb 2011 19:42:44 +0000 (11:42 -0800)]
Merge "bias towards space in select text"
Derek Sollenberger [Thu, 24 Feb 2011 18:47:46 +0000 (13:47 -0500)]
Only show video texture when frames are available.
bug:
3460361
Change-Id: Ifcf97b4360e0a86cfcc100e6287e1fbce8d2185a
Leon Scroggins [Thu, 24 Feb 2011 17:34:42 +0000 (12:34 -0500)]
Stop the blinking caret when moving to another field.
Bug:
2930013
Requires a change in frameworks/base.
Change-Id: I892fcdd9b9a0abdcf82e5bb26c930b68ae8b10fa
Teng-Hui Zhu [Thu, 24 Feb 2011 01:17:20 +0000 (17:17 -0800)]
Fixed element in iframe support
We first identify the iframe for each LayerAndroid.
Then when traverse to update the fixed elements, we use the parent iframe
info to update the fixed position.
Change-Id: I13e0333fc6453414cea2343a787c41d525f6e3d2
Cary Clark [Thu, 24 Feb 2011 17:20:18 +0000 (12:20 -0500)]
bias towards space in select text
When computing the presence or absence of a space,
it's usually the case that the absense of a space case
has no error. The presence of a space may have more
error, since the size of the space may be adjusted by
the page.
When the two computed errors are equal, bias towards
the space case. This fixes text selection on Google News.
bug:
3470564
Change-Id: I1feadd945e9faaf970bca0702a7cf79429592784
Derek Sollenberger [Thu, 24 Feb 2011 13:27:46 +0000 (05:27 -0800)]
Merge "Skia Merge (revision 808)"
Steve Block [Thu, 24 Feb 2011 12:54:25 +0000 (04:54 -0800)]
Merge "Copy constructor for AutoJObject must increase the ref count on the underlying object"
Steve Block [Wed, 23 Feb 2011 13:49:10 +0000 (13:49 +0000)]
Copy constructor for AutoJObject must increase the ref count on the underlying object
This is needed to balance the derefs in any temporary instance's d'tor.
See https://chromereview.prom.corp.google.com/
2013001
Change-Id: I8329f475ecbd1bc8669d0e8d368f1a385d891fb3
Derek Sollenberger [Tue, 22 Feb 2011 19:00:57 +0000 (14:00 -0500)]
Skia Merge (revision 808)
This is a companion CL to the one found in /external/skia
Change-Id: I469b8845a88f24d972fd57ee5c9cab505a5b83aa
Patrick Scott [Tue, 22 Feb 2011 19:06:12 +0000 (11:06 -0800)]
Merge "Scroll the RenderLayer during touch events."
Cary Clark [Tue, 22 Feb 2011 18:01:47 +0000 (10:01 -0800)]
Merge "fix select text space detection"
Cary Clark [Tue, 22 Feb 2011 17:31:24 +0000 (12:31 -0500)]
fix select text space detection
Some helpers like isSpace() are used in two contexts: while the
picture is parsed, and after the best answer in the picture has
been found. The proper paint must be used in each case.
Associate paints with candidate and best glyphs, so that the
appropriate paint can be used as needed.
bug:
3470564
Change-Id: I28bcc82dbe727ee3ef0716e7657e61a982467a40
Patrick Scott [Tue, 22 Feb 2011 16:20:56 +0000 (11:20 -0500)]
Scroll the RenderLayer during touch events.
Keep track of the owning layer for each LayerAndroid. No longer need to unadjust
the node bounds since the node will be scrolled into view.
Bug:
3442108
Change-Id: I7c9604d347af326ccfb86e6d3f2b95b7ce1b97c1
Kristian Monsen [Mon, 21 Feb 2011 15:22:52 +0000 (07:22 -0800)]
Merge "Fix for bug
3424689 Corrupt (truncated) downloads for apk from browser"
Steve Block [Mon, 21 Feb 2011 13:10:33 +0000 (05:10 -0800)]
Merge "Fix a leaked JNI LocaRef in WebViewCore::jsPrompt()"
Steve Block [Mon, 21 Feb 2011 11:12:10 +0000 (11:12 +0000)]
Fix a leaked JNI LocaRef in WebViewCore::jsPrompt()
Bug:
3470906
Change-Id: I8fb9ddcf4ff3dee35c2225a18a86b4015002da96
Nicolas Roard [Sat, 19 Feb 2011 15:39:19 +0000 (07:39 -0800)]
am
d3b2919d: (-s ours) am
634f229e: Do not merge: Cherry-pick Fix ANR in the browser from master
* commit '
d3b2919d307e4b0ea98b7b5c67991c853c99b562':
Do not merge: Cherry-pick Fix ANR in the browser from master
Nicolas Roard [Sat, 19 Feb 2011 15:35:45 +0000 (07:35 -0800)]
am
634f229e: Do not merge: Cherry-pick Fix ANR in the browser from master
* commit '
634f229e4f0075b052e110ba0a89554c46f6c510':
Do not merge: Cherry-pick Fix ANR in the browser from master
Nicolas Roard [Sat, 19 Feb 2011 09:22:16 +0000 (01:22 -0800)]
Do not merge: Cherry-pick Fix ANR in the browser from master
Sometimes we were not releasing textures as they were busy; they could
still be deleted when swapping the layers trees, and as they were
also still present in the LayerTexture Hashmap this was causing an ANR
(at best -- the texture was already deallocated, the LayerTexture dtor
was then trying to release() them...)
bug:
3398660
Change-Id: I3b08af94a6a7041d45d373ebaec0ec4ba59dac82
Nicolas Roard [Sat, 19 Feb 2011 09:20:06 +0000 (01:20 -0800)]
am
d3f53495: (-s ours) am
928bc355: Merge "Do not merge: Cherry-pick 2nd part of GL_BLEND CL from master" into honeycomb
* commit '
d3f534955e1e80e5a9192c84db518f8f0eff5b00':
Do not merge: Cherry-pick 2nd part of GL_BLEND CL from master
Nicolas Roard [Sat, 19 Feb 2011 09:16:48 +0000 (01:16 -0800)]
am
928bc355: Merge "Do not merge: Cherry-pick 2nd part of GL_BLEND CL from master" into honeycomb
* commit '
928bc35505a3fa29f1598842d49124c06703f972':
Do not merge: Cherry-pick 2nd part of GL_BLEND CL from master
Nicolas Roard [Sat, 19 Feb 2011 09:13:56 +0000 (01:13 -0800)]
Merge "Do not merge: Cherry-pick 2nd part of GL_BLEND CL from master" into honeycomb
Nicolas Roard [Sat, 19 Feb 2011 05:09:18 +0000 (21:09 -0800)]
am
ffef3d3a: (-s ours) am
6f7a546a: Do not merge: Cherry-pick Flash performance CL from Master
* commit '
ffef3d3a1baae44ba44696024ddc12f92337d518':
Do not merge: Cherry-pick Flash performance CL from Master