OSDN Git Service
Ben Murdoch [Fri, 6 May 2011 12:49:37 +0000 (13:49 +0100)]
Merge WebKit at r74534: Rename rendering methods
Following the rename of *visible to *visual upstream,
make them in our platform code.
See http://trac.webkit.org/changeset/73385
Change-Id: Ic4cb1ed8736d67bbc6e963b9f409bfdae07d5c5f
Ben Murdoch [Fri, 6 May 2011 12:03:38 +0000 (13:03 +0100)]
Merge WebKit at r74534: Fix WebSettings.cpp
Fix our platform code after upstream refactoring to
GeolocationPositionCache.
http://trac.webkit.org/changeset/74226
Change-Id: I07202da9252741576f3133c2daa0222bc2b67e61
Ben Murdoch [Fri, 6 May 2011 11:59:41 +0000 (12:59 +0100)]
Merge WebKit at r74534: Fix WebCoreFrameBridge.cpp
Update platform code after upstream refactoring.
See http://trac.webkit.org/changeset/73444
Change-Id: I5ae9bc2cf49f7a2e6c27294fbf72ce7c68a80e4d
Ben Murdoch [Fri, 6 May 2011 11:54:10 +0000 (12:54 +0100)]
Merge WebKit at r74534: Fix EditorClientAndroid.cpp (SpellChecker)
Add stub for new method added upstream: requestCheckingOfString(...)
See http://trac.webkit.org/changeset/73886
Change-Id: I94d6940e48066c56e1032f12d683c530603bffc4
Ben Murdoch [Fri, 6 May 2011 11:50:54 +0000 (12:50 +0100)]
Merge WebKit at r74534: Fix EditorClientAndroid.cpp (getGuessesForWord)
Update function signature of EditorClient::getGuessesForWord to
match upstream change.
See http://trac.webkit.org/changeset/73088
Change-Id: Iedffbb3216a0da036f5ea61f6b282d50f50b2d0f
Ben Murdoch [Fri, 6 May 2011 11:47:48 +0000 (12:47 +0100)]
Merge WebKit at r74534: Fix WebCoreFrameBridge.cpp and
FormManagerAndroid.cpp
Platform code needs updating after upstream refactoring.
See http://trac.webkit.org/changeset/73430
Change-Id: If9306164c5dae24fb11af724979c0187d28792da
Ben Murdoch [Fri, 6 May 2011 11:13:23 +0000 (12:13 +0100)]
Merge WebKit at r74534: Fix RenderBlockLineLayout.cpp and others.
Fixes RenderBlockLineLayout.cpp, WebViewCore.cpp and CacheBuilder.cpp
after upstream refactoring.
See http://trac.webkit.org/changeset/73618
Change-Id: I7942d6d77ce70ceb147dd711c5229c649242b10c
Ben Murdoch [Fri, 6 May 2011 11:03:10 +0000 (12:03 +0100)]
Merge WebKit at r74534: Fix ImageSourceAndroid.cpp
Use enums instead of booleans after upstream refactoring.
See http://trac.webkit.org/changeset/73819
Change-Id: Ifbfd886e7ff3779068b9aa2f0c849b2a8a449b84
Ben Murdoch [Fri, 6 May 2011 10:58:37 +0000 (11:58 +0100)]
Merge WebKit at r74534: Fix ImageBufferAndroid.cpp
Update our platform ImageBuffer class after new features added
upstream.
See http://trac.webkit.org/changeset/73949 and
http://trac.webkit.org/changeset/73925
Change-Id: I40a982c855faabbbdbc0cb13dd503d3bbe76f3ef
Ben Murdoch [Fri, 6 May 2011 10:54:21 +0000 (11:54 +0100)]
Merge WebKit at r74534: Fix GraphicsContextAndroid.cpp (Paths)
Update our platform FraphicsContext after upstream Path
refactoring.
See http://trac.webkit.org/changeset/72926
Change-Id: I574ede8dfc74fce5edc3558cd63c6b703f45fe7c
Ben Murdoch [Fri, 6 May 2011 10:38:43 +0000 (11:38 +0100)]
Merge WebKit at r74534: Fix GraphicsContextAndroid.cpp
Update our platform GraphicsContext after upstream refactoring.
See http://trac.webkit.org/changeset/73492
See http://trac.webkit.org/changeset/73728
Change-Id: I1d5ea12a57e7b96a90c1df250c716647bc4e0f26
Ben Murdoch [Fri, 6 May 2011 10:36:03 +0000 (11:36 +0100)]
Merge WebKit at r74534: Fix FontDataAndroid.cpp
Add new functions introduced upstream for CSS
text-emphasis property.
See http://trac.webkit.org/changeset/74169
Change-Id: I5fff00db5b30979e29c9af75650e5df8d9eaff64
Ben Murdoch [Fri, 6 May 2011 10:21:12 +0000 (11:21 +0100)]
Merge WebKit at r74534: Fix FontAndroid.cpp (TextMode constants)
Port style changes to our code.
See http://trac.webkit.org/changeset/73284
Change-Id: I03a5a7aa7a9a319ac4dbfc257c7adf83b362107c
Ben Murdoch [Thu, 5 May 2011 16:58:00 +0000 (17:58 +0100)]
Merge WebKit at r74534: Fix FontAndroid.cpp (getShadow)
Update GraphicsContext::getShadow callsite with new
parameter.
See http://trac.webkit.org/changeset/74463
Change-Id: Ibfb36831800a57968963a5619c8425f5551829f5
Ben Murdoch [Thu, 5 May 2011 16:52:53 +0000 (17:52 +0100)]
Merge WebKit at r74534: Fix GraphicsContext.cpp
Git got confused in the initial merge, and inserted
the new version of this function but left the old
one too, so remove the old definition of
GraphicsContext::shadowsIgnoreTransforms()
See http://trac.webkit.org/changeset/74532
Change-Id: Ide2cebc27122560349d715c25063a5a93cb54a0d
Ben Murdoch [Thu, 5 May 2011 16:43:50 +0000 (17:43 +0100)]
Merge WebKit at r74534: Fix CachedResourceLoader.cpp
Make upstream changes in our code.
See http://trac.webkit.org/changeset/73749
Change-Id: I6764c637cf0c7ed0bf0dabde47488b95c1fa7062
Ben Murdoch [Thu, 5 May 2011 16:15:17 +0000 (17:15 +0100)]
Merge WebKit at r74534: Fix Makefiles
Change-Id: Ife4c035f871dd827884645255ce788fbdb49f84e
Ben Murdoch [Thu, 5 May 2011 13:51:35 +0000 (14:51 +0100)]
Merge WebKit at r74534: Fix conflicts.
.gitignore - keep ours
Android.mk http://trac.webkit.org/changeset/74431
Parser.cpp http://trac.webkit.org/changeset/74377
ImageDecoder.cpp http://trac.webkit.org/changeset/73819
GraphicsContext.cpp http://trac.webkit.org/changeset/73729
ContextMenuItem.h http://trac.webkit.org/changeset/74028
SVGFontFaceUriElement.h http://trac.webkit.org/changeset/74493
RenderView.h http://trac.webkit.org/changeset/74524
RenderSVGResourceSolidColor.cpp http://trac.webkit.org/changeset/72926
InlineTextBox.cpp http://trac.webkit.org/changeset/73548
SliderThumbElement.cpp
RenderSlider.cpp http://trac.webkit.org/changeset/74044
StyleRareInheritedData.cpp|h
CSSStyleSelector.cpp
CSSParser.cpp http://trac.webkit.org/changeset/73219
RenderBox.h http://trac.webkit.org/changeset/73385
FrameLoader.cpp http://trac.webkit.org/changeset/73486 http://trac.webkit.org/changeset/74426
ResourceLoader.cpp http://trac.webkit.org/changeset/74453
DOMWindow.cpp|h http://trac.webkit.org/changeset/73829
HTMLLinkElement.cpp http://trac.webkit.org/changeset/74476
V8NPUtils.cpp: Do not undo http://trac.webkit.org/changeset/78994
RenderSVGResourceSolidColor.cpp http://trac.webkit.org/changeset/72926
Remove loader.cpp http://trac.webkit.org/changeset/74049
Change-Id: I8e97de5b2237d85310e1005e067f0b3a6b14432f
Ben Murdoch [Thu, 5 May 2011 13:36:32 +0000 (14:36 +0100)]
Merge WebKit at r74534: Initial merge by git.
Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
Kristian Monsen [Tue, 10 May 2011 13:43:22 +0000 (14:43 +0100)]
Cleanspec needed for change https://android-git.corp.google.com/g/#change,109065
Change-Id: Ic0627398c525f9c616024a81a70380775a981361
Teng-Hui Zhu [Thu, 5 May 2011 22:30:38 +0000 (15:30 -0700)]
Better support for exiting full screen
When exiting the full screen, we need to let the webkit know the status.
bug:
4312214
Change-Id: I4e475da3b426176fd232551e16fbe740994d8d36
The Android Automerger [Mon, 9 May 2011 17:57:59 +0000 (10:57 -0700)]
am
23652748: (-s ours) am
1d62edec: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTE
* commit '
23652748ca27723b6da70f90460064d542f62130':
DO NOT MERGE
DO NOT MERGE Fix issue with zooming in/out quickly
DO NOT MERGE ANR fix
DO NOT MERGE priority queue based tile manager
The Android Automerger [Mon, 9 May 2011 17:39:57 +0000 (10:39 -0700)]
am
1d62edec: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTE
* commit '
1d62edecbc901d7d88ac6729e25aa0ad44b3aa04':
DO NOT MERGE
DO NOT MERGE Fix issue with zooming in/out quickly
DO NOT MERGE ANR fix
DO NOT MERGE priority queue based tile manager
The Android Automerger [Mon, 9 May 2011 05:37:22 +0000 (22:37 -0700)]
Merge remote branch 'goog/honeycomb-mr2' into honeycomb-LTE
Russell Brenner [Fri, 6 May 2011 16:03:45 +0000 (09:03 -0700)]
Merge "DO NOT MERGE" into honeycomb-mr2
John Reck [Fri, 6 May 2011 15:34:09 +0000 (08:34 -0700)]
Merge "DO NOT MERGE Fix issue with zooming in/out quickly" into honeycomb-mr2
John Reck [Fri, 6 May 2011 15:34:00 +0000 (08:34 -0700)]
Merge "DO NOT MERGE ANR fix" into honeycomb-mr2
John Reck [Thu, 5 May 2011 23:16:52 +0000 (16:16 -0700)]
Fix issue where solid was drawn instead of ring
Bug:
4283275
Change-Id: Ie05440e3618ffa36004af35fed3d350763f09d50
David Deephanphongs [Sun, 1 May 2011 23:18:52 +0000 (16:18 -0700)]
DO NOT MERGE
Cherry-pick change I2ae80ddc from master:
Fix crash in font-handling code caused by repainting while a style recalculation was pending.
The Android FrameCache was being updated while a style recalculation
was pending. This would cause the cached fonts in the
FontFallbackList to be accessed, but that cache is not necessarily
consistant while a recalculation is pending.
A similar issue was occurring with recordPictureSet.
In updateFrameCache() and recordPictureSet(), early-abort if the document
is waiting for a style recalculation. In notifyProgressFinished(), remove
the call to updateFrameCache().
Bug:
4292199
Bug:
4291311
Change-Id: Ie8bc4cb0637ccb7aee37597ac08fd8abffc149cd
John Reck [Thu, 5 May 2011 19:59:45 +0000 (12:59 -0700)]
DO NOT MERGE Fix issue with zooming in/out quickly
Fixes an issue where BaseLayer would get stuck in a state
trying to prepare the next page, but no longer needed to prepare
a new page. This is caused by setting kWillScheduleRequest, but
then the user zooming back to the starting scale.
Change-Id: I4717482e451e3b9ce74b4cc431d7cec6760d1012
John Reck [Fri, 8 Apr 2011 18:41:20 +0000 (11:41 -0700)]
DO NOT MERGE ANR fix
Race condition in BaseTile could cause a texture's owner to change
to a BaseTile, without that BaseTile actually using that texture. This
could cause two texture's to point to the same BaseTile.
Bug:
4268381
Change-Id: I66b38a042e66fc32f4e098428d1f4a537d76a9d8
John Reck [Thu, 24 Mar 2011 01:02:27 +0000 (18:02 -0700)]
DO NOT MERGE priority queue based tile manager
Removes TileSets and queues tiles individually
Uses a priority queue to determine which tiles to render first
Stops rendering the front tile page if we are prepping the back one
Limits queue spam by tracking which tiles are already in the queue
Change-Id: Idd4154b8a2771d0db2da94c84a683314597f8542
John Reck [Thu, 5 May 2011 20:08:45 +0000 (13:08 -0700)]
Merge "Fix issue with zooming in then out very quickly"
John Reck [Thu, 5 May 2011 19:59:45 +0000 (12:59 -0700)]
Fix issue with zooming in then out very quickly
Change-Id: I38d38d9c84a32182c84c3f89365ea8760664bd52
Teng-Hui Zhu [Tue, 3 May 2011 16:55:46 +0000 (09:55 -0700)]
Add the touch event handling for the slider.
bug:
4232704
Change-Id: Ia3ac8a6003c1ff7b06d2a226b3206a3be0f8c6b5
Teng-Hui Zhu [Wed, 4 May 2011 22:43:53 +0000 (15:43 -0700)]
Merge "Correct the move latest positioning"
Russell Brenner [Wed, 4 May 2011 21:52:01 +0000 (14:52 -0700)]
Merge "Fix crash in font-handling code caused by repainting while a style recalculation was pending."
David Deephanphongs [Sun, 1 May 2011 23:18:52 +0000 (16:18 -0700)]
Fix crash in font-handling code caused by repainting while a style recalculation was pending.
The Android FrameCache was being updated while a style recalculation
was pending. This would cause the cached fonts in the
FontFallbackList to be accessed, but that cache is not necessarily
consistant while a recalculation is pending.
A similar issue was occurring with recordPictureSet.
In updateFrameCache() and recordPictureSet(), early-abort if the document
is waiting for a style recalculation. In notifyProgressFinished(), remove
the call to updateFrameCache().
BUG=
4292199
Change-Id: I2ae80ddc2d596e2f15455f54f4de7dde6e42ade8
Nicolas Roard [Wed, 4 May 2011 00:44:11 +0000 (17:44 -0700)]
Implement hiding backfaces
bug:
3456544
Change-Id: I0e6b10e435432ddbf40085c4b3a7a7e22baed28a
Nicolas Roard [Tue, 3 May 2011 23:44:01 +0000 (16:44 -0700)]
Fix z-sorting
bug:
3456526
Change-Id: Idfde406fec0d7afba91506eba806cd0b56cde784
Teng-Hui Zhu [Tue, 3 May 2011 18:51:59 +0000 (11:51 -0700)]
Correct the move latest positioning
This is fixing the issue when we move the slider, the moveLastest will send to
0,0, which cause a jump on the slider.
bug:
4232704
Change-Id: Ic7235158cbfb690a38f53ca1b3e4757a5d1a69f3
Derek Sollenberger [Thu, 28 Apr 2011 21:02:20 +0000 (14:02 -0700)]
Merge "Fix CSS shadows and provide better support for HTML5 Canvas shadows."
Derek Sollenberger [Thu, 28 Apr 2011 18:52:32 +0000 (14:52 -0400)]
Fix CSS shadows and provide better support for HTML5 Canvas shadows.
bug:
4347315
Change-Id: I78c86f7da6174984dae9ac3db21e9168857f651b
Nicolas Roard [Thu, 28 Apr 2011 18:45:55 +0000 (11:45 -0700)]
am
e5a6c868: am
0702955d: am
2d60bef7: Fix clipping issues with layers
* commit '
e5a6c868b4e82b9c4d7a536d1ab977149346e156':
Fix clipping issues with layers
Nicolas Roard [Thu, 28 Apr 2011 01:47:11 +0000 (18:47 -0700)]
am
0702955d: am
2d60bef7: Fix clipping issues with layers
* commit '
0702955df30f6610313bdf9363bc22a7fd6d640a':
Fix clipping issues with layers
Nicolas Roard [Thu, 28 Apr 2011 01:44:46 +0000 (18:44 -0700)]
am
2d60bef7: Fix clipping issues with layers
* commit '
2d60bef786645e5b9e2da0e8374d3f06a40d0638':
Fix clipping issues with layers
Dima Zavin [Thu, 28 Apr 2011 00:12:58 +0000 (17:12 -0700)]
Merge "webkit: convert to use new audio.h"
Nicolas Roard [Wed, 20 Apr 2011 17:39:28 +0000 (10:39 -0700)]
Fix clipping issues with layers
Fix remaining gmail/slate.com issues, embedded webview in apps, etc.
bug:
4303702
Change-Id: I3fb0e7b618d62d9d8baa096dad4fc4f0ad66cc1b
Bart Sears [Wed, 20 Apr 2011 17:24:46 +0000 (10:24 -0700)]
am
752846c3: (-s ours) am
c471914f: am
80e2925e: Merge "DO NOT MERGE" into honeycomb-mr1
* commit '
752846c3545e73f6dc643afc8f8ebd8d84e39fe8':
DO NOT MERGE
Bart Sears [Wed, 20 Apr 2011 17:24:44 +0000 (10:24 -0700)]
am
9e879a96: (-s ours) am
4cebdc6a: am
0357bffe: Merge "DO NOT MERGE" into honeycomb-mr1
* commit '
9e879a9666886e49cfea841f0317116a108c1bc0':
DO NOT MERGE
Nicolas Roard [Wed, 20 Apr 2011 17:24:41 +0000 (10:24 -0700)]
am
8b8e0317: am
e448c08e: am
8804f084: Fix for clipped layers
* commit '
8b8e0317b9dc035ae96cba7eb3a10dfba3c0c172':
Fix for clipped layers
Bart Sears [Wed, 20 Apr 2011 17:17:18 +0000 (10:17 -0700)]
am
c471914f: am
80e2925e: Merge "DO NOT MERGE" into honeycomb-mr1
* commit '
c471914f1c3bb86fb8c2fae304d848e7675a9258':
DO NOT MERGE
Bart Sears [Wed, 20 Apr 2011 17:17:16 +0000 (10:17 -0700)]
am
4cebdc6a: am
0357bffe: Merge "DO NOT MERGE" into honeycomb-mr1
* commit '
4cebdc6a346b38052dbdcc29d90247e4bc7f8c5c':
DO NOT MERGE
Nicolas Roard [Wed, 20 Apr 2011 17:17:13 +0000 (10:17 -0700)]
am
e448c08e: am
8804f084: Fix for clipped layers
* commit '
e448c08e0f1ff5c948071498d73ff9b40a52fd21':
Fix for clipped layers
Bart Sears [Wed, 20 Apr 2011 17:14:33 +0000 (10:14 -0700)]
am
80e2925e: Merge "DO NOT MERGE" into honeycomb-mr1
* commit '
80e2925eccdb827184e288d20181bf186db9391b':
DO NOT MERGE
Bart Sears [Wed, 20 Apr 2011 17:14:31 +0000 (10:14 -0700)]
am
0357bffe: Merge "DO NOT MERGE" into honeycomb-mr1
* commit '
0357bffe4faf3b906879e8f180ddcc46d97687fc':
DO NOT MERGE
Nicolas Roard [Wed, 20 Apr 2011 17:14:28 +0000 (10:14 -0700)]
am
8804f084: Fix for clipped layers
* commit '
8804f0848d7d3165c86cbb529e3b51cffdb4b56b':
Fix for clipped layers
Steve Block [Wed, 20 Apr 2011 12:11:26 +0000 (13:11 +0100)]
Fix a compiler warning in handleTouchEvent()
Change-Id: I6aeafd3d83bbb114164445e7d9f6da0fbc0589f5
Steve Block [Wed, 20 Apr 2011 11:55:29 +0000 (12:55 +0100)]
Avoid prematurely deleting a JNI local ref in FindAddress
Change-Id: Ib0e34890dd37736f809bbdd044ecc63320fe0ed6
Dima Zavin [Tue, 5 Apr 2011 23:03:58 +0000 (16:03 -0700)]
webkit: convert to use new audio.h
Change-Id: I2754c4fdf8a367530e2be5c215e5a3823e4957c5
Signed-off-by: Dima Zavin <dima@android.com>
Bart Sears [Wed, 20 Apr 2011 04:44:42 +0000 (21:44 -0700)]
Merge "DO NOT MERGE" into honeycomb-mr1
Bart Sears [Wed, 20 Apr 2011 04:43:45 +0000 (21:43 -0700)]
Merge "DO NOT MERGE" into honeycomb-mr1
Nicolas Roard [Wed, 20 Apr 2011 02:27:23 +0000 (19:27 -0700)]
Fix for clipped layers
bug:
4303702
Change-Id: I31f8df1e24206ef6389f814d421a3fb84b1dc00f
Huahui Wu [Tue, 19 Apr 2011 22:51:22 +0000 (15:51 -0700)]
DO NOT MERGE
cherry pick of https://android-git.corp.google.com/g/#change,106682
b/
3491968 stop the hanging of dunkindonuts.com
Sometimes, a sync load can wait forever and lock up the network thread,
here we replace Wait() with TimedWait() with multiple tries to avoid locking.
Unfortunately, TimedWait() doesn't return anything and can't tell if it's
a timeout or a quick pass, so we query timeofday and allow a few seconds for
the system timing error.
Change-Id: I991617130f93b44518d28926725f261d4569d73c
Nicolas Roard [Fri, 1 Apr 2011 17:14:33 +0000 (10:14 -0700)]
DO NOT MERGE
Cherry-picked from master
Fix layers flickering
bug:
4266091 bug:
4181605 bug:
4211039 bug:
4308380
Change-Id: I73950c4378f10b22c5c10d5b697cfba3cb46105a
Huahui Wu [Tue, 19 Apr 2011 15:58:00 +0000 (08:58 -0700)]
b/
3491968 stop the hanging of dunkindonuts.com
Same as https://android-git.corp.google.com/g/#change,105743 but in Master.
Changed the waiting to 10 seconds each attempt after asking around.
Sometimes, a sync load can wait forever and lock up the network thread,
here we replace Wait() with TimedWait() with multiple tries to avoid locking.
Unfortunately, TimedWait() doesn't return anything and can't tell if it's
a timeout or a quick pass, so we query timeofday and allow a few seconds for
the system timing error.
Change-Id: I391fb3f815413f17b2927c1e90cbddab7faed071
Derek Sollenberger [Thu, 14 Apr 2011 14:03:14 +0000 (10:03 -0400)]
Skia Merge (revision 1116)
Update draw looper to use the refactored skia code.
Change-Id: I1e97d57f53f05f0699371fbef12ab2ef34faad29
Nicolas Roard [Thu, 14 Apr 2011 00:48:48 +0000 (17:48 -0700)]
Limit the number of layers created for fixed position.
Change-Id: If7093770b420b37fbb0b073c85f96e781abc55c2
John Reck [Wed, 13 Apr 2011 01:17:44 +0000 (18:17 -0700)]
resolved conflicts for merge of
dd4e6571 to master
Change-Id: I15e24dbb177aaed8b8349ef2e809582400f840c2
Nicolas Roard [Wed, 13 Apr 2011 00:59:47 +0000 (17:59 -0700)]
am
9011f30e: am
1deed5ff: Fix out-of-place content when zooming out.
* commit '
9011f30e569e6d05a2e4a39db84b07703a4c194b':
Fix out-of-place content when zooming out.
Nicolas Roard [Wed, 13 Apr 2011 00:57:57 +0000 (17:57 -0700)]
am
1deed5ff: Fix out-of-place content when zooming out.
* commit '
1deed5ff76dad5d0783c0e07639338f1d6b08a67':
Fix out-of-place content when zooming out.
Nicolas Roard [Thu, 24 Mar 2011 16:52:26 +0000 (09:52 -0700)]
Fix for maps
- Fix a repaint scheduling bug preventing layers containing only
and image to update
- Use an SkBitmap instead of SkBitmapRef and do a deep copy
instead to prevent synchronization issues with the webkit thread.
bug:
4173057
Change-Id: I221fd0062e03ab4633b83d558956db48a408a194
John Reck [Tue, 12 Apr 2011 22:48:51 +0000 (15:48 -0700)]
Merge "Tweak ring drawing"
John Reck [Tue, 12 Apr 2011 22:32:10 +0000 (15:32 -0700)]
Tweak ring drawing
Added some padding
Darkened the overlay
Change-Id: I96b53b1a31c44e3d895465cbbfefeef6b6f001ec
Nicolas Roard [Tue, 12 Apr 2011 22:11:45 +0000 (15:11 -0700)]
Merge "Fix layers flickering"
Nicolas Roard [Fri, 1 Apr 2011 17:14:33 +0000 (10:14 -0700)]
Fix layers flickering
bug:
4266091 bug:
4181605
Change-Id: I34152628a1f31b017b1b238db2c90dcdb5c6a45f
Ben Murdoch [Tue, 12 Apr 2011 20:28:12 +0000 (13:28 -0700)]
am
443e71d3: (-s ours) am
80aad5ee: (-s ours) am
622d72be: Clear DOM storage when clearing other cached data. Do not merge.
* commit '
443e71d3876c6249806d9e712b95ad6208df0278':
Clear DOM storage when clearing other cached data. Do not merge.
Ben Murdoch [Tue, 12 Apr 2011 20:18:31 +0000 (13:18 -0700)]
am
80aad5ee: (-s ours) am
622d72be: Clear DOM storage when clearing other cached data. Do not merge.
* commit '
80aad5eedfe9e84cabb8540f818f7d1971ecadc3':
Clear DOM storage when clearing other cached data. Do not merge.
Ben Murdoch [Tue, 12 Apr 2011 10:13:59 +0000 (03:13 -0700)]
am
622d72be: Clear DOM storage when clearing other cached data. Do not merge.
* commit '
622d72beb96a024bb18591feb39d4b21d0a34bd7':
Clear DOM storage when clearing other cached data. Do not merge.
Nicolas Roard [Thu, 4 Nov 2010 02:49:27 +0000 (19:49 -0700)]
Implements the focus ring drawing in GL.
In WebView::drawGL(), we check if the extras to draw are rings,
and if so we get their rectangles and pass that to GLWebViewState.
Updated with holo colors
Change-Id: Id5f8941f16dba1733e8a84eae8cd2b317fbc7c55
Ben Murdoch [Mon, 11 Apr 2011 19:08:03 +0000 (20:08 +0100)]
Clear DOM storage when clearing other cached data. Do not merge.
Empty out DOM local and session storage in addition to HTML5
database and app cache when we get a request from java to
delete cached data.
Cherry pick of I5b6ee075d2a8fb44ee373ad4462a33623c9c2460
Bug:
4267038
Change-Id: Id2dece1963d443c3758710e9c3e871054991ae32
Nicolas Roard [Fri, 8 Apr 2011 21:17:49 +0000 (14:17 -0700)]
Fix out-of-place content when zooming out.
bug:
4271501
Change-Id: I9836f2775b0acf89b09b6edf2111cd44f0d1daa8
John Reck [Fri, 8 Apr 2011 18:41:20 +0000 (11:41 -0700)]
Potential ANR fix
Race condition in BaseTile could cause a texture's owner to change
to a BaseTile, without that BaseTile actually using that texture. This
could cause two texture's to point to the same BaseTile.
Bug:
4268381
Change-Id: I5e04b1604093ab0b1af7c2e5571c46a03680766a
Nicolas Roard [Fri, 8 Apr 2011 00:31:19 +0000 (17:31 -0700)]
am
a6e37cd4: am
15692f0c: Merge "Fix regression for superpudu animations" into honeycomb-mr1
* commit '
a6e37cd4911df717eef13fa5bcc484617e2cd7b9':
Fix regression for superpudu animations
Nicolas Roard [Fri, 8 Apr 2011 00:27:55 +0000 (17:27 -0700)]
am
f1a6509b: am
b6ac9086: Merge "Fix for bug:
4183801" into honeycomb-mr1
* commit '
f1a6509bb189c2240a8723c2a96d677d98d8b142':
Fix for bug:
4183801
Nicolas Roard [Fri, 8 Apr 2011 00:27:03 +0000 (17:27 -0700)]
am
15692f0c: Merge "Fix regression for superpudu animations" into honeycomb-mr1
* commit '
15692f0cb85c86ff494b94d4e61ad0757f5238b4':
Fix regression for superpudu animations
Nicolas Roard [Fri, 8 Apr 2011 00:25:49 +0000 (17:25 -0700)]
Merge "Fix regression for superpudu animations" into honeycomb-mr1
Nicolas Roard [Thu, 7 Apr 2011 23:45:06 +0000 (16:45 -0700)]
Fix regression for superpudu animations
bug:
4181605 bug:
3389597
Change-Id: I2717cdfdeea12df434a119bb8dcc9d2f17f07a7e
(cherry picked from commit
14866c7d6aaa0930627503d0b49bde8e21e90a6e)
Nicolas Roard [Fri, 8 Apr 2011 00:24:07 +0000 (17:24 -0700)]
am
b6ac9086: Merge "Fix for bug:
4183801" into honeycomb-mr1
* commit '
b6ac908669555fedfaf5dc648367d4ad459fc53e':
Fix for bug:
4183801
Nicolas Roard [Fri, 8 Apr 2011 00:21:50 +0000 (17:21 -0700)]
Merge "Fix for bug:
4183801" into honeycomb-mr1
Nicolas Roard [Tue, 5 Apr 2011 01:40:11 +0000 (18:40 -0700)]
Fix for bug:
4183801
The computation for the invalidated / clipping rects were wrong,
sometimes causing the linked bug when layers had a transparent
background (they were not obeying the clipping rect passed by
the framework).
java counterpart CL:
https://android-git.corp.google.com/g/#change,105503
Change-Id: I60769e7cbf1a3a939724c57b3d3ce63a6f87aa87
John Reck [Thu, 7 Apr 2011 23:48:20 +0000 (16:48 -0700)]
am
74e0ecaa: am
63f5370e: Fix race condition
* commit '
74e0ecaa08d693681bb58899b789e520a7b14281':
Fix race condition
John Reck [Thu, 7 Apr 2011 23:44:32 +0000 (16:44 -0700)]
am
63f5370e: Fix race condition
* commit '
63f5370e1736a4e699dd9ccd643525772d67ffef':
Fix race condition
John Reck [Thu, 7 Apr 2011 23:25:54 +0000 (16:25 -0700)]
Fix race condition
Bug:
4262018
Change-Id: I0ddda2348e72484cd57fc1909efed47bf8e2222d
Teng-Hui Zhu [Thu, 7 Apr 2011 19:05:07 +0000 (12:05 -0700)]
am
bb69eea5: am
e4cbbfc0: Merge "Show the fullscreen button all the time" into honeycomb-mr1
* commit '
bb69eea599d55bb1958713e8f1614c9e7f38b2f2':
Show the fullscreen button all the time
Teng-Hui Zhu [Thu, 7 Apr 2011 19:02:02 +0000 (12:02 -0700)]
am
e4cbbfc0: Merge "Show the fullscreen button all the time" into honeycomb-mr1
* commit '
e4cbbfc01b360475415d07bc3a4276fc46e828b9':
Show the fullscreen button all the time
Teng-Hui Zhu [Thu, 7 Apr 2011 18:59:42 +0000 (11:59 -0700)]
Merge "Show the fullscreen button all the time" into honeycomb-mr1
Teng-Hui Zhu [Wed, 6 Apr 2011 22:01:42 +0000 (15:01 -0700)]
Show the fullscreen button all the time
bug:
4232704
Change-Id: I64833baeab708fabe88873573235a896b86b6098
Brian Carlstrom [Wed, 6 Apr 2011 17:06:21 +0000 (10:06 -0700)]
Merge "Remove unsafe jclass member variable that was not a JNI global reference"
Brian Carlstrom [Wed, 6 Apr 2011 05:18:38 +0000 (22:18 -0700)]
Remove unsafe jclass member variable that was not a JNI global reference
Change-Id: I8a7c2ff1325685ac03517f7277b057f7d1d56661