OSDN Git Service
John Reck [Fri, 13 May 2011 19:20:40 +0000 (12:20 -0700)]
am
68b5dbab: (-s ours) am
7d1dae3f: am
58348114: Merge "DO NOT MERGE cursor ring drawing in GL" into honeycomb-mr2
* commit '
68b5dbab241bbfcaf8dbed500a2402c268081634':
DO NOT MERGE cursor ring drawing in GL
Steve Block [Fri, 13 May 2011 13:44:40 +0000 (06:44 -0700)]
Merge changes Ide388898,Ic49f367c,I1158a808,Iacb6ca5d,I2100dd3a,I5c1abe54,Ib0ef9902,I31dbc523,I570314b3
* changes:
Merge WebKit at r75315: Update WebKit version
Merge WebKit at r75315: Add FrameLoaderClient PageCache stubs
Merge WebKit at r75315: Stub out AXObjectCache::remove()
Merge WebKit at r75315: Fix ImageBuffer
Merge WebKit at r75315: Fix PluginData::initPlugins()
Merge WebKit at r75315: Fix conflicts
Merge WebKit at r75315: Fix Makefiles
Merge WebKit at r75315: Move Android-specific WebCore files to Source
Merge WebKit at r75315: Initial merge by git.
Steve Block [Thu, 12 May 2011 14:11:16 +0000 (15:11 +0100)]
Merge WebKit at r75315: Update WebKit version
Change-Id: Ide38889853d77176e4e8733a823bb607644ae9bf
Steve Block [Thu, 12 May 2011 14:10:20 +0000 (15:10 +0100)]
Merge WebKit at r75315: Add FrameLoaderClient PageCache stubs
See http://trac.webkit.org/changeset/74571
Change-Id: Ic49f367c0f35c2aa04d255193ff6ebd4d7e41d54
Steve Block [Mon, 9 May 2011 18:51:44 +0000 (19:51 +0100)]
Merge WebKit at r75315: Stub out AXObjectCache::remove()
See http://trac.webkit.org/changeset/75031
Change-Id: I1158a8086e2b184f5728eb1ea3d6344af4fee162
Steve Block [Mon, 9 May 2011 18:00:11 +0000 (19:00 +0100)]
Merge WebKit at r75315: Fix ImageBuffer
See http://trac.webkit.org/changeset/74868
Change-Id: Iacb6ca5dd044a7bf08eb43012457b92f3a6beccd
Steve Block [Mon, 9 May 2011 17:48:31 +0000 (18:48 +0100)]
Merge WebKit at r75315: Fix PluginData::initPlugins()
See http://trac.webkit.org/changeset/75217
Change-Id: I2100dd3ab2d96de8ab18f0cb873dcdff082569c2
Steve Block [Mon, 9 May 2011 16:47:02 +0000 (17:47 +0100)]
Merge WebKit at r75315: Fix conflicts
- HTMLInputElement.cpp
Conflict due to ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS
See http://trac.webkit.org/changeset/74895
- HTMLInputElement.cpp and RangeInputType.cpp
Conflict due to refactoring of event handling on input elements
See http://trac.webkit.org/changeset/74549
- DOMWindow.cpp
Conflict due to DOMWindow::clearDOMStorage()
See http://trac.webkit.org/changeset/74800
- EventHandler.cpp
Conflict due to longpress and doubletap vs touch event refactoring
See http://trac.webkit.org/changeset/74553
- History.cpp
Trivial conflict due to cherry-pick
See http://trac.webkit.org/changeset/74853
- GraphicsContext.cpp
Conflict due to PLATFORM(ANDROID) guard
See http://trac.webkit.org/changeset/74662
- InlineTextBox.cpp
Conflict due to ANDROID_DISABLE_ROUNDING_HACKS
See http://trac.webkit.org/changeset/74971
Change-Id: I5c1abe54b9d78f667a41e83a871e9a21be0a89d5
Steve Block [Mon, 9 May 2011 18:57:19 +0000 (19:57 +0100)]
Merge WebKit at r75315: Fix Makefiles
See http://trac.webkit.org/changeset/74646
Change-Id: Ib0ef9902925ddb13ec97fad0753515b10b1d3c01
John Reck [Fri, 13 May 2011 00:39:37 +0000 (17:39 -0700)]
am
7d1dae3f: am
58348114: Merge "DO NOT MERGE cursor ring drawing in GL" into honeycomb-mr2
* commit '
7d1dae3f7a9a698d4564b3529278fa703aed7d89':
DO NOT MERGE cursor ring drawing in GL
John Reck [Fri, 13 May 2011 00:35:33 +0000 (17:35 -0700)]
am
58348114: Merge "DO NOT MERGE cursor ring drawing in GL" into honeycomb-mr2
* commit '
58348114645f3987aaabae40612a876cfd2bc678':
DO NOT MERGE cursor ring drawing in GL
John Reck [Thu, 12 May 2011 23:29:48 +0000 (16:29 -0700)]
Merge "DO NOT MERGE cursor ring drawing in GL" into honeycomb-mr2
Dima Zavin [Thu, 12 May 2011 23:05:58 +0000 (16:05 -0700)]
Merge "update for new audio.h header location"
Dima Zavin [Wed, 11 May 2011 21:14:50 +0000 (14:14 -0700)]
update for new audio.h header location
Change-Id: I62351e590d89ef68b26248936a4d63df4557182c
Signed-off-by: Dima Zavin <dima@android.com>
Jean-Baptiste Queru [Thu, 12 May 2011 21:02:09 +0000 (14:02 -0700)]
am
3ba807b9: am
169f8bc5: (-s ours) Merge "Remove unused function that relies on an obsolete API"
* commit '
3ba807b9f832658bf3f9b7638103308acf22506a':
Remove unused function that relies on an obsolete API
Jean-Baptiste Queru [Thu, 12 May 2011 20:58:21 +0000 (13:58 -0700)]
am
169f8bc5: (-s ours) Merge "Remove unused function that relies on an obsolete API"
* commit '
169f8bc5df73bcd9cd286f188d1c741ce5035c37':
Remove unused function that relies on an obsolete API
Jean-Baptiste Queru [Thu, 12 May 2011 20:40:05 +0000 (13:40 -0700)]
Merge "Remove unused function that relies on an obsolete API"
Jean-Baptiste Queru [Thu, 12 May 2011 20:29:42 +0000 (13:29 -0700)]
Remove unused function that relies on an obsolete API
Change-Id: I9bf5b4abb570f84a472740ec3076200398767ecb
Jean-Baptiste Queru [Thu, 12 May 2011 20:28:53 +0000 (13:28 -0700)]
am
5fa3323c: (-s ours) am
61719739: Merge "Port toward newer versions of skia."
* commit '
5fa3323c37a1e7731e88e9042f79f9686b151bf5':
Port toward newer versions of skia.
Jean-Baptiste Queru [Thu, 12 May 2011 20:20:04 +0000 (13:20 -0700)]
am
61719739: Merge "Port toward newer versions of skia."
* commit '
61719739938e34b0a33995d4ab72eaa4604bcf67':
Port toward newer versions of skia.
Jean-Baptiste Queru [Thu, 12 May 2011 19:57:04 +0000 (12:57 -0700)]
am
7c3ea1eb: am
d45deba0: (-s ours) Merge "Switch to SkSafeRef"
* commit '
7c3ea1eb3b026b8c46748911c4a539d4df56942c':
Switch to SkSafeRef
Jean-Baptiste Queru [Thu, 12 May 2011 19:56:57 +0000 (12:56 -0700)]
Merge "Port toward newer versions of skia."
Jean-Baptiste Queru [Thu, 12 May 2011 19:55:38 +0000 (12:55 -0700)]
Port toward newer versions of skia.
Change-Id: Id3f330a151227ff95cc15d2a65be6004dbac05a7
Jean-Baptiste Queru [Thu, 12 May 2011 19:53:59 +0000 (12:53 -0700)]
am
d45deba0: (-s ours) Merge "Switch to SkSafeRef"
* commit '
d45deba0c666cf706366b04ae4e529c91ff23e79':
Switch to SkSafeRef
Jean-Baptiste Queru [Thu, 12 May 2011 19:23:22 +0000 (12:23 -0700)]
Merge "Switch to SkSafeRef"
Jean-Baptiste Queru [Thu, 12 May 2011 19:22:37 +0000 (12:22 -0700)]
Switch to SkSafeRef
Change-Id: Ia4fa9adb7d5096e71357d3428244cbe35f24bd50
Jean-Baptiste Queru [Thu, 12 May 2011 16:04:24 +0000 (09:04 -0700)]
am
c9818b52: am
555569c5: (-s ours) Merge "Switch to SkSafeUnref for better portability"
* commit '
c9818b52072bfb7663b37f272d5e926296428780':
Switch to SkSafeUnref for better portability
Jean-Baptiste Queru [Thu, 12 May 2011 16:02:34 +0000 (09:02 -0700)]
am
555569c5: (-s ours) Merge "Switch to SkSafeUnref for better portability"
* commit '
555569c59ced09743507966f73d2d500c6deccec':
Switch to SkSafeUnref for better portability
Jean-Baptiste Queru [Thu, 12 May 2011 15:05:27 +0000 (08:05 -0700)]
Merge "Switch to SkSafeUnref for better portability"
Steve Block [Mon, 9 May 2011 15:25:46 +0000 (16:25 +0100)]
Merge WebKit at r75315: Move Android-specific WebCore files to Source
This moves files in the following WebCore subdirectories ...
- bindings/js
- bindings/v8/custom
- plugins/android
- platform/android
- platform/graphics/android
- page/
- css/
- dom/
- loader/archive/android
Steve Block [Fri, 6 May 2011 10:45:16 +0000 (11:45 +0100)]
Merge WebKit at r75315: Initial merge by git.
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
Steve Block [Thu, 12 May 2011 11:45:56 +0000 (12:45 +0100)]
Clean up JavaBridge
This is in preparation for the fix for null weak global references.
No functional change.
Bug:
4336862
Change-Id: I4ef7d999cf6b915b3f2af7a76c2414d5537891e5
Steve Block [Thu, 12 May 2011 11:45:16 +0000 (12:45 +0100)]
Clean up DeviceMotionClientImpl and DeviceOrientationClientImpl
This is in preparation for the fix for null weak global references.
No functional change.
Bug:
4336862
Change-Id: I1718df5e4b443471e3c166e5ad8ae984b395ec38
Steve Block [Thu, 12 May 2011 11:43:55 +0000 (12:43 +0100)]
Clean up WebViewCore
This is in preparation for the fix for null weak global references.
No functional change.
Bug:
4336862
Change-Id: Icaf11948b0488d10ef112372275a254114a7efb3
Jean-Baptiste Queru [Wed, 11 May 2011 22:41:55 +0000 (15:41 -0700)]
Switch to SkSafeUnref for better portability
Change-Id: Idffdf11f857e28190cbe7ebf3fa08c5b3a8eb192
Derek Sollenberger [Wed, 11 May 2011 13:01:45 +0000 (09:01 -0400)]
Add null pointer check when searching for a plugin widget.
bug:
4395730
Change-Id: I4fb5c129084a8f1d1e3f3951c9cac77a0df4d296
Russell Brenner [Tue, 10 May 2011 18:15:57 +0000 (11:15 -0700)]
am
5581ea83: am
86ca6e2e: am
c74d30ac: Merge "Fix calculation in WebView::scrollRectOnScreen" into honeycomb-mr2
* commit '
5581ea8383a0348a04997c772f8a032c146459af':
Fix calculation in WebView::scrollRectOnScreen
Nicolas Roard [Tue, 10 May 2011 18:14:42 +0000 (11:14 -0700)]
Russell Brenner [Tue, 10 May 2011 16:41:18 +0000 (09:41 -0700)]
am
86ca6e2e: am
c74d30ac: Merge "Fix calculation in WebView::scrollRectOnScreen" into honeycomb-mr2
* commit '
86ca6e2e4d40c69c268633e600ef5b045d102180':
Fix calculation in WebView::scrollRectOnScreen
Russell Brenner [Tue, 10 May 2011 16:33:46 +0000 (09:33 -0700)]
am
c74d30ac: Merge "Fix calculation in WebView::scrollRectOnScreen" into honeycomb-mr2
* commit '
c74d30ac1079750a0d7f87704a9962f8045cce94':
Fix calculation in WebView::scrollRectOnScreen
Russell Brenner [Tue, 10 May 2011 16:30:16 +0000 (09:30 -0700)]
Merge "Fix calculation in WebView::scrollRectOnScreen" into honeycomb-mr2
Steve Block [Mon, 9 May 2011 19:27:07 +0000 (20:27 +0100)]
Clean up makefiles in preparation for new Source/ directory
Change-Id: Iebb4d96933c59028f024ac29b348b98d13a29610
Steve Block [Mon, 9 May 2011 18:07:42 +0000 (19:07 +0100)]
Clean up includes in WebStorage.cpp
Change-Id: I66d260c506b0a3bd0379866bd5e794497b20c9c5
Ben Murdoch [Tue, 10 May 2011 12:44:49 +0000 (13:44 +0100)]
Merge WebKit at r74534: Update ThirdPartyProject.prop
Change-Id: I2548b0257a8eb52bbe12149640a23352476b05c0
Ben Murdoch [Fri, 6 May 2011 11:25:41 +0000 (12:25 +0100)]
Merge WebKit at r74534: Fix build. (XSLTProcessoeLibxslt.cpp)
Cherry pick r86144 to fix the build.
See http://trac.webkit.org/changeset/86144
Change-Id: Ief3510eeaedcd433ce9e1d2ddd9bb5ed1b0a6808
Ben Murdoch [Fri, 6 May 2011 14:09:25 +0000 (15:09 +0100)]
Merge WebKit at r74534: Fix GraphicsContextAndroid.cpp (setPlatformCompositeOperation)
Implement new setPlatformCompositeOperation method from
upstream.
See http://trac.webkit.org/changeset/73729
Change-Id: Ic87c3b8beec48c6b4c7bef5db61c6082f7e53639
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
Nicolas Roard [Tue, 10 May 2011 01:11:19 +0000 (18:11 -0700)]
Nicolas Roard [Tue, 10 May 2011 01:04:35 +0000 (18:04 -0700)]
Nicolas Roard [Thu, 24 Mar 2011 16:52:26 +0000 (09:52 -0700)]
DO NOT MERGE
Cherry pick from Master
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: Iace8e21b776df7b357654f66d40d159a1701b86d
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
Nicolas Roard [Thu, 4 Nov 2010 02:49:27 +0000 (19:49 -0700)]
DO NOT MERGE cursor ring drawing in GL
Cherry pick of 3 CLs:
105851, 105988, 108900
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
Russell Brenner [Thu, 5 May 2011 20:16:52 +0000 (13:16 -0700)]
Fix calculation in WebView::scrollRectOnScreen
Call to subtractLayers() was always returning an empty rect and, as a
result, we would exit without calling viewInvalidate().
Bug:
4310520
Change-Id: Icad9e3efd157e5ae970a3200f5b0bbecbee66f79
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