summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 68b5dbab: (-s ours) am 7d1dae3f: am 58348114: Merge "DO NOT MERGE cursor ↵John Reck2011-05-130-0/+0
|\ | | | | | | | | | | | | ring drawing in GL" into honeycomb-mr2 * commit '68b5dbab241bbfcaf8dbed500a2402c268081634': DO NOT MERGE cursor ring drawing in GL
| * am 7d1dae3f: am 58348114: Merge "DO NOT MERGE cursor ring drawing in GL" ↵John Reck2011-05-127-6/+136
| |\ | | | | | | | | | | | | | | | | | | into honeycomb-mr2 * commit '7d1dae3f7a9a698d4564b3529278fa703aed7d89': DO NOT MERGE cursor ring drawing in GL
| | * am 58348114: Merge "DO NOT MERGE cursor ring drawing in GL" into honeycomb-mr2John Reck2011-05-127-6/+136
| | |\ | | | | | | | | | | | | | | | | * commit '58348114645f3987aaabae40612a876cfd2bc678': DO NOT MERGE cursor ring drawing in GL
| | | * Merge "DO NOT MERGE cursor ring drawing in GL" into honeycomb-mr2John Reck2011-05-127-6/+136
| | | |\
| | | | * DO NOT MERGE cursor ring drawing in GLNicolas Roard2011-05-057-6/+136
| | | | | | | | | | | | | | | | | | | | | | | | | Cherry pick of 3 CLs: 105851, 105988, 108900
* | | | | Merge changes ↵Steve Block2011-05-1310617-477573/+565358
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | Merge WebKit at r75315: Update WebKit versionSteve Block2011-05-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ide38889853d77176e4e8733a823bb607644ae9bf
| * | | | | Merge WebKit at r75315: Add FrameLoaderClient PageCache stubsSteve Block2011-05-131-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/74571 Change-Id: Ic49f367c0f35c2aa04d255193ff6ebd4d7e41d54
| * | | | | Merge WebKit at r75315: Stub out AXObjectCache::remove()Steve Block2011-05-131-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/75031 Change-Id: I1158a8086e2b184f5728eb1ea3d6344af4fee162
| * | | | | Merge WebKit at r75315: Fix ImageBufferSteve Block2011-05-131-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/74868 Change-Id: Iacb6ca5dd044a7bf08eb43012457b92f3a6beccd
| * | | | | Merge WebKit at r75315: Fix PluginData::initPlugins()Steve Block2011-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/75217 Change-Id: I2100dd3ab2d96de8ab18f0cb873dcdff082569c2
| * | | | | Merge WebKit at r75315: Fix conflictsSteve Block2011-05-137-193/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
| * | | | | Merge WebKit at r75315: Fix MakefilesSteve Block2011-05-137-116/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/74646 Change-Id: Ib0ef9902925ddb13ec97fad0753515b10b1d3c01
| * | | | | Merge WebKit at r75315: Move Android-specific WebCore files to SourceSteve Block2011-05-12100-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-1210511-476518/+564565
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
* | | | | | Merge "update for new audio.h header location"Dima Zavin2011-05-121-1/+1
|\ \ \ \ \ \
| * | | | | | update for new audio.h header locationDima Zavin2011-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I62351e590d89ef68b26248936a4d63df4557182c Signed-off-by: Dima Zavin <dima@android.com>
* | | | | | | am 3ba807b9: am 169f8bc5: (-s ours) Merge "Remove unused function that ↵Jean-Baptiste Queru2011-05-120-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | | | | | | | | | | | | | | relies on an obsolete API" * commit '3ba807b9f832658bf3f9b7638103308acf22506a': Remove unused function that relies on an obsolete API
| * | | | | am 169f8bc5: (-s ours) Merge "Remove unused function that relies on an ↵Jean-Baptiste Queru2011-05-120-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | obsolete API" * commit '169f8bc5df73bcd9cd286f188d1c741ce5035c37': Remove unused function that relies on an obsolete API
| | * \ \ \ \ Merge "Remove unused function that relies on an obsolete API"Jean-Baptiste Queru2011-05-121-7/+0
| | |\ \ \ \ \
| | | * | | | | Remove unused function that relies on an obsolete APIJean-Baptiste Queru2011-05-121-7/+0
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I9bf5b4abb570f84a472740ec3076200398767ecb
* | | | | | | am 5fa3323c: (-s ours) am 61719739: Merge "Port toward newer versions of skia."Jean-Baptiste Queru2011-05-120-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '5fa3323c37a1e7731e88e9042f79f9686b151bf5': Port toward newer versions of skia.
| * | | | | | am 61719739: Merge "Port toward newer versions of skia."Jean-Baptiste Queru2011-05-121-0/+4
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '61719739938e34b0a33995d4ab72eaa4604bcf67': Port toward newer versions of skia.
| | * | | | | Merge "Port toward newer versions of skia."Jean-Baptiste Queru2011-05-121-0/+4
| | |\ \ \ \ \
| | | * | | | | Port toward newer versions of skia.Jean-Baptiste Queru2011-05-121-0/+4
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: Id3f330a151227ff95cc15d2a65be6004dbac05a7
* | | | | | | am 7c3ea1eb: am d45deba0: (-s ours) Merge "Switch to SkSafeRef"Jean-Baptiste Queru2011-05-120-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '7c3ea1eb3b026b8c46748911c4a539d4df56942c': Switch to SkSafeRef
| * | | | | | am d45deba0: (-s ours) Merge "Switch to SkSafeRef"Jean-Baptiste Queru2011-05-120-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'd45deba0c666cf706366b04ae4e529c91ff23e79': Switch to SkSafeRef
| | * | | | | Merge "Switch to SkSafeRef"Jean-Baptiste Queru2011-05-128-20/+20
| | |\ \ \ \ \
| | | * | | | | Switch to SkSafeRefJean-Baptiste Queru2011-05-128-20/+20
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia4fa9adb7d5096e71357d3428244cbe35f24bd50
* | | | | | | am c9818b52: am 555569c5: (-s ours) Merge "Switch to SkSafeUnref for better ↵Jean-Baptiste Queru2011-05-120-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | portability" * commit 'c9818b52072bfb7663b37f272d5e926296428780': Switch to SkSafeUnref for better portability
| * | | | | | am 555569c5: (-s ours) Merge "Switch to SkSafeUnref for better portability"Jean-Baptiste Queru2011-05-120-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '555569c59ced09743507966f73d2d500c6deccec': Switch to SkSafeUnref for better portability
| | * | | | | Merge "Switch to SkSafeUnref for better portability"Jean-Baptiste Queru2011-05-1218-37/+37
| | |\ \ \ \ \
| | | * | | | | Switch to SkSafeUnref for better portabilityJean-Baptiste Queru2011-05-1118-37/+37
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: Idffdf11f857e28190cbe7ebf3fa08c5b3a8eb192
* | | | | | | Clean up JavaBridgeSteve Block2011-05-121-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for the fix for null weak global references. No functional change. Bug: 4336862 Change-Id: I4ef7d999cf6b915b3f2af7a76c2414d5537891e5
* | | | | | | Clean up DeviceMotionClientImpl and DeviceOrientationClientImplSteve Block2011-05-122-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for the fix for null weak global references. No functional change. Bug: 4336862 Change-Id: I1718df5e4b443471e3c166e5ad8ae984b395ec38
* | | | | | | Clean up WebViewCoreSteve Block2011-05-122-44/+35
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for the fix for null weak global references. No functional change. Bug: 4336862 Change-Id: Icaf11948b0488d10ef112372275a254114a7efb3
* | | | | | Add null pointer check when searching for a plugin widget.Derek Sollenberger2011-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 4395730 Change-Id: I4fb5c129084a8f1d1e3f3951c9cac77a0df4d296
* | | | | | am 5581ea83: am 86ca6e2e: am c74d30ac: Merge "Fix calculation in ↵Russell Brenner2011-05-101-8/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebView::scrollRectOnScreen" into honeycomb-mr2 * commit '5581ea8383a0348a04997c772f8a032c146459af': Fix calculation in WebView::scrollRectOnScreen
| * | | | | am 86ca6e2e: am c74d30ac: Merge "Fix calculation in ↵Russell Brenner2011-05-101-8/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | WebView::scrollRectOnScreen" into honeycomb-mr2 * commit '86ca6e2e4d40c69c268633e600ef5b045d102180': Fix calculation in WebView::scrollRectOnScreen
| | * | | | am c74d30ac: Merge "Fix calculation in WebView::scrollRectOnScreen" into ↵Russell Brenner2011-05-101-8/+0
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr2 * commit 'c74d30ac1079750a0d7f87704a9962f8045cce94': Fix calculation in WebView::scrollRectOnScreen
| | | * | | Merge "Fix calculation in WebView::scrollRectOnScreen" into honeycomb-mr2Russell Brenner2011-05-101-8/+0
| | | |\ \ \
| | | | * | | Fix calculation in WebView::scrollRectOnScreenRussell Brenner2011-05-051-8/+0
| | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call to subtractLayers() was always returning an empty rect and, as a result, we would exit without calling viewInvalidate(). Bug: 4310520 Change-Id: Icad9e3efd157e5ae970a3200f5b0bbecbee66f79
* | | | | | am 53cd6a87: (-s ours) am aecd2790: am c3da3ea3: DO NOT MERGENicolas Roard2011-05-100-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '53cd6a873bfb9f6d301aa5e1f62a2be622d5ddfb': DO NOT MERGE
| * | | | | am aecd2790: am c3da3ea3: DO NOT MERGENicolas Roard2011-05-094-20/+60
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'aecd2790ab5d8d358eb7a7ee0181a52ca18bc179': DO NOT MERGE
| | * | | | am c3da3ea3: DO NOT MERGENicolas Roard2011-05-094-20/+60
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit 'c3da3ea3d67930a5593b455cdc697171a9115cae': DO NOT MERGE
| | | * | | DO NOT MERGENicolas Roard2011-05-094-20/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Clean up makefiles in preparation for new Source/ directorySteve Block2011-05-104-102/+103
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iebb4d96933c59028f024ac29b348b98d13a29610
* | | | | | Clean up includes in WebStorage.cppSteve Block2011-05-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I66d260c506b0a3bd0379866bd5e794497b20c9c5
* | | | | | Merge WebKit at r74534: Update ThirdPartyProject.propBen Murdoch2011-05-101-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2548b0257a8eb52bbe12149640a23352476b05c0
* | | | | | Merge WebKit at r74534: Fix build. (XSLTProcessoeLibxslt.cpp)Ben Murdoch2011-05-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry pick r86144 to fix the build. See http://trac.webkit.org/changeset/86144 Change-Id: Ief3510eeaedcd433ce9e1d2ddd9bb5ed1b0a6808
generated by cgit v1.1 at 2025-01-12 21:41:32 +0000