OSDN Git Service
Andrei Popescu [Tue, 27 Oct 2009 12:21:29 +0000 (05:21 -0700)]
am
d7a32d06: Merge change I676eb2d5 into eclair-mr2
Merge commit '
d7a32d06b4a2872680edc40f01ecce12e3b61b4a'
* commit '
d7a32d06b4a2872680edc40f01ecce12e3b61b4a':
Avoid calling setDatabaseDirectoryPath() when the path is already set.
Android (Google) Code Review [Tue, 27 Oct 2009 12:04:50 +0000 (08:04 -0400)]
Merge change I676eb2d5 into eclair-mr2
* changes:
Avoid calling setDatabaseDirectoryPath() when the path is already set.
Andrei Popescu [Tue, 27 Oct 2009 11:58:04 +0000 (11:58 +0000)]
Avoid calling setDatabaseDirectoryPath() when the path is already set.
http://b/issue?id=
2215217
Steve Block [Mon, 26 Oct 2009 16:09:17 +0000 (09:09 -0700)]
am
1e13e466: Merge change I3788a1e3 into eclair-mr2
Merge commit '
1e13e466217c7ffb96f5cde0ad0ab8606c0c2481'
* commit '
1e13e466217c7ffb96f5cde0ad0ab8606c0c2481':
Remove XPathNSResolver from the Android build.
Android (Google) Code Review [Mon, 26 Oct 2009 15:53:51 +0000 (11:53 -0400)]
Merge change I3788a1e3 into eclair-mr2
* changes:
Remove XPathNSResolver from the Android build.
Andrei Popescu [Mon, 26 Oct 2009 15:43:32 +0000 (08:43 -0700)]
am
064849d8: Merge change I3a8abed5 into eclair-mr2
Merge commit '
064849d86c5d90bf7459b0e8bd781de92141499c'
* commit '
064849d86c5d90bf7459b0e8bd781de92141499c':
Enable the dispatching of the 'ended' media event.
Android (Google) Code Review [Mon, 26 Oct 2009 15:26:53 +0000 (11:26 -0400)]
Merge change I3a8abed5 into eclair-mr2
* changes:
Enable the dispatching of the 'ended' media event.
Andrei Popescu [Mon, 26 Oct 2009 15:21:19 +0000 (15:21 +0000)]
Enable the dispatching of the 'ended' media event.
Partial fix for http://b/issue?id=
2210105
Patrick Scott [Mon, 26 Oct 2009 14:51:40 +0000 (07:51 -0700)]
am
0845a459: Change the assert to check for JNI_OK
Merge commit '
0845a4594c81421404715b666f5b3c989d9b2c5c'
* commit '
0845a4594c81421404715b666f5b3c989d9b2c5c':
Change the assert to check for JNI_OK
Patrick Scott [Mon, 26 Oct 2009 14:22:19 +0000 (07:22 -0700)]
am
4fa0517d: Change eventTypes to eventNames to fix the assert.
Merge commit '
4fa0517dc551c82c1123712b9324bd90ed193d14'
* commit '
4fa0517dc551c82c1123712b9324bd90ed193d14':
Change eventTypes to eventNames to fix the assert.
Patrick Scott [Mon, 26 Oct 2009 14:11:29 +0000 (10:11 -0400)]
Change the assert to check for JNI_OK
jniRegisterNativeMethods returns -1 (JNI_ERR) or 0 (JNI_OK), not the number of
methods registered.
Patrick Scott [Mon, 26 Oct 2009 13:32:52 +0000 (09:32 -0400)]
Change eventTypes to eventNames to fix the assert.
Steve Block [Mon, 26 Oct 2009 11:23:47 +0000 (11:23 +0000)]
Remove XPathNSResolver from the Android build.
Also remove a few other unnnecessary files from the JSC Makefile.
Change-Id: I3788a1e3f60941e9712b4c4345ba09fa0a5ad390
Leon Scroggins [Fri, 23 Oct 2009 16:55:17 +0000 (09:55 -0700)]
am
7160f16b: Merge change I28a61bf7 into eclair-mr2
Merge commit '
7160f16bdcd50dec1aa684e0e1753427057fb218'
* commit '
7160f16bdcd50dec1aa684e0e1753427057fb218':
Allow java WebView to check the readonly status of a node.
Steve Block [Fri, 23 Oct 2009 16:28:09 +0000 (09:28 -0700)]
am
f107b761: Merge change If6634f88 into eclair-mr2
Merge commit '
f107b76121f90297b7976f7398a7ce40b285d17b'
* commit '
f107b76121f90297b7976f7398a7ce40b285d17b':
Updates V8 bindings to use INSPECTOR guard.
Android (Google) Code Review [Fri, 23 Oct 2009 16:21:56 +0000 (12:21 -0400)]
Merge change I28a61bf7 into eclair-mr2
* changes:
Allow java WebView to check the readonly status of a node.
Leon Scroggins [Fri, 23 Oct 2009 15:51:20 +0000 (11:51 -0400)]
Allow java WebView to check the readonly status of a node.
Required for a change to frameworks/base
(https://android-git.corp.google.com/g/30939 )
Android (Google) Code Review [Fri, 23 Oct 2009 15:47:48 +0000 (11:47 -0400)]
Merge change If6634f88 into eclair-mr2
* changes:
Updates V8 bindings to use INSPECTOR guard.
Leon Scroggins [Fri, 23 Oct 2009 15:19:11 +0000 (08:19 -0700)]
am
f514da7c: Remove some unused variables.
Merge commit '
f514da7c6b4891ba0db5043e7be58bb49df9a72c'
* commit '
f514da7c6b4891ba0db5043e7be58bb49df9a72c':
Remove some unused variables.
Leon Scroggins [Fri, 23 Oct 2009 13:41:05 +0000 (09:41 -0400)]
Remove some unused variables.
Steve Block [Thu, 22 Oct 2009 15:38:18 +0000 (16:38 +0100)]
Updates V8 bindings to use INSPECTOR guard.
Also adds PLATFORM(ANDROID) guards around Android-specific changes that have yet to be upstreamed to webkit.org.
Change-Id: If6634f8800832dc31713b9558e86f528489bb537
Grace Kloba [Fri, 23 Oct 2009 02:06:06 +0000 (19:06 -0700)]
am
1d597e09: Merge change I85cea76f into eclair-mr2
Merge commit '
1d597e09bd6fa3e654abaf5790d6c18c996828e2'
* commit '
1d597e09bd6fa3e654abaf5790d6c18c996828e2':
The new WebKit expects atomicIncrement to return int
Android (Google) Code Review [Thu, 22 Oct 2009 23:06:12 +0000 (19:06 -0400)]
Merge change I85cea76f into eclair-mr2
* changes:
The new WebKit expects atomicIncrement to return int instead of void.
Grace Kloba [Thu, 22 Oct 2009 18:17:39 +0000 (11:17 -0700)]
am
212dbf67: am
228543b5: Apparently we can\'t use atomic_inc/dec version as it causes more crashes. Revert it.
Merge commit '
212dbf678c6c25f17b2e83cf89cf7120fa091591'
* commit '
212dbf678c6c25f17b2e83cf89cf7120fa091591':
Apparently we can't use atomic_inc/dec version as it
Grace Kloba [Thu, 22 Oct 2009 18:17:34 +0000 (11:17 -0700)]
am
d4e3cca2: am
87689f70: Back in 02/08 when we added android_atomic_inc/dec, for some reason, it missed define WTF_USE_LOCKFREE_THREADSAFESHARED. So we are using mutexlocker instead of refcount inc/dec. Even mutex version should work, but it is not exercised by win/d
Merge commit '
d4e3cca24a5ef05cbdd9549564ed047c0b8db218'
* commit '
d4e3cca24a5ef05cbdd9549564ed047c0b8db218':
Back in 02/08 when we added android_atomic_inc/dec, for
Grace Kloba [Thu, 22 Oct 2009 17:48:01 +0000 (10:48 -0700)]
am
228543b5: Apparently we can\'t use atomic_inc/dec version as it causes more crashes. Revert it.
Merge commit '
228543b5f412cbed35f233c6295661ae5f008269' into eclair-mr2
* commit '
228543b5f412cbed35f233c6295661ae5f008269':
Apparently we can't use atomic_inc/dec version as it
Grace Kloba [Thu, 22 Oct 2009 17:45:53 +0000 (10:45 -0700)]
am
87689f70: Back in 02/08 when we added android_atomic_inc/dec, for some reason, it missed define WTF_USE_LOCKFREE_THREADSAFESHARED. So we are using mutexlocker instead of refcount inc/dec. Even mutex version should work, but it is not exercised by win/darwin/gcc. Ch
Merge commit '
87689f70d66dc2559c19e60ab6f759874eeea56a' into eclair-mr2
* commit '
87689f70d66dc2559c19e60ab6f759874eeea56a':
Back in 02/08 when we added android_atomic_inc/dec, for
Steve Block [Thu, 22 Oct 2009 16:18:30 +0000 (09:18 -0700)]
am
aa7096a5: Merge change Id27cf0b0 into eclair-mr2
Merge commit '
aa7096a5b71e0570943488a17400a68d5eb5dcb7'
* commit '
aa7096a5b71e0570943488a17400a68d5eb5dcb7':
Makes a number of changes to ease future merging with and upstreaming to webkit.org.
Android (Google) Code Review [Thu, 22 Oct 2009 15:52:26 +0000 (11:52 -0400)]
Merge change Id27cf0b0 into eclair-mr2
* changes:
Makes a number of changes to ease future merging with and upstreaming to webkit.org.
Steve Block [Wed, 21 Oct 2009 13:12:09 +0000 (14:12 +0100)]
Makes a number of changes to ease future merging with and upstreaming to webkit.org.
- Fixes whitespace discrepancies between webkit.org and Android versions
- Re-orders Android-specific changes to minimise the diff with webkit.org
- Makes sure all Android-specific changes are appropriately guarded.
- Fixes some Android-specific style problems
None of these should introduce any functional changes for PLATFORM(ANDROID).
Change-Id: Id27cf0b0e8682a7f29590c3fccae2d287b3630f1
Cary Clark [Thu, 22 Oct 2009 13:56:20 +0000 (06:56 -0700)]
am
ff613c79: (-s ours) am
e9901563: (-s ours) do not merge: fix copy/paste using trackball on passion
Merge commit '
ff613c797ca92cac618df0ce5b85fec2f864df9d'
* commit '
ff613c797ca92cac618df0ce5b85fec2f864df9d':
do not merge: fix copy/paste using trackball on passion
Cary Clark [Thu, 22 Oct 2009 13:37:54 +0000 (06:37 -0700)]
am
e9901563: (-s ours) do not merge: fix copy/paste using trackball on passion
Merge commit '
e99015639226215f6e9089a7a49b196e40e625f0' into eclair-mr2
* commit '
e99015639226215f6e9089a7a49b196e40e625f0':
do not merge: fix copy/paste using trackball on passion
Steve Block [Thu, 22 Oct 2009 11:04:46 +0000 (04:04 -0700)]
am
ffc078d7: Merge change I4cc74167 into eclair-mr2
Merge commit '
ffc078d7261938b4f892145243265b3229411fdc'
* commit '
ffc078d7261938b4f892145243265b3229411fdc':
Remove superfluous files from WebCore/svg/graphics.
Cary Clark [Thu, 22 Oct 2009 11:04:41 +0000 (04:04 -0700)]
am
b962974b: Merge change I3efa919a into eclair-mr2
Merge commit '
b962974b492a268d385321ef1822111b25569c73'
* commit '
b962974b492a268d385321ef1822111b25569c73':
fix multiple text areas, and text areas without focus rings
Android (Google) Code Review [Thu, 22 Oct 2009 10:49:59 +0000 (06:49 -0400)]
Merge change I4cc74167 into eclair-mr2
* changes:
Remove superfluous files from WebCore/svg/graphics.
Grace Kloba [Wed, 21 Oct 2009 23:07:17 +0000 (16:07 -0700)]
Apparently we can't use atomic_inc/dec version as it
causes more crashes. Revert it.
Revert https://android-git.corp.google.com/g/30606
Grace Kloba [Wed, 21 Oct 2009 18:55:15 +0000 (11:55 -0700)]
The new WebKit expects atomicIncrement to return int
instead of void.
Android (Google) Code Review [Wed, 21 Oct 2009 18:21:26 +0000 (14:21 -0400)]
Merge change I3efa919a into eclair-mr2
* changes:
fix multiple text areas, and text areas without focus rings
Cary Clark [Wed, 21 Oct 2009 17:59:54 +0000 (13:59 -0400)]
fix multiple text areas, and text areas without focus rings
Separate nodes that are hidden from nodes that disable
drawing the focus ring. If a node draws its own focus state,
other than not drawing the ring, it should be indistinguishable
from other focusable nodes.
Fix the nav cache dump to be in line with the latest webkit.
fixes http://b/issue?id=
2201049
Steve Block [Wed, 21 Oct 2009 16:13:26 +0000 (17:13 +0100)]
Remove superfluous files from WebCore/svg/graphics.
This change removes the contents of the following directories, which were removed in http://trac.webkit.org/changeset/44332
- WebCore/svg/graphics/cairo
- WebCore/svg/graphics/cg
- WebCore/svg/graphics/filters/cg
- WebCore/svg/graphics/mac
- WebCore/svg/graphics/qt
- WebCore/svg/graphics/skia
These files contained Android specific edits, but these were trivial (ENABLE(FILTERS) changed to ENABLE(SVG_FILTERS)).
Due to these changes, the files were not deleted in subsequent WebKit merges.
Only WebCore/svg/graphics/skia/SVGResourceFilterSkia.cpp was used in Android Makefiles, and this was only in the V8 Makefile.
When SVG is re-enabled, the Android code will have to be updated to work with the refactoring that has taken place in WebKit, so I'm deleting these files now to ease WebKit merging and upstreaming.
Change-Id: I4cc74167193175d05bf6b0382b3059b5230cc94d
Leon Scroggins [Wed, 21 Oct 2009 14:32:58 +0000 (07:32 -0700)]
am
2e6cbc52: Do not show radio/checkboxes for <optgroup> labels.
Merge commit '
2e6cbc526015b55b3dc853cf15445a8537b70869'
* commit '
2e6cbc526015b55b3dc853cf15445a8537b70869':
Do not show radio/checkboxes for <optgroup> labels.
Leon Scroggins [Mon, 19 Oct 2009 23:02:43 +0000 (19:02 -0400)]
Do not show radio/checkboxes for <optgroup> labels.
Fix for http://b/issue?id=
2186188. Keep track of <optgroup> labels
separately from disabled <option> labels. Requires a change to
frameworks/base.
Steve Block [Wed, 21 Oct 2009 13:46:17 +0000 (06:46 -0700)]
am
5c9d7370: Merge change I0554b1b9 into eclair-mr2
Merge commit '
5c9d7370ae13ad2e17aaa70bce7ef5494371fd52'
* commit '
5c9d7370ae13ad2e17aaa70bce7ef5494371fd52':
Removes duplicate AppCache methods from WebCore.base.exp.
Android (Google) Code Review [Wed, 21 Oct 2009 13:34:51 +0000 (09:34 -0400)]
Merge change I0554b1b9 into eclair-mr2
* changes:
Removes duplicate AppCache methods from WebCore.base.exp.
Steve Block [Wed, 21 Oct 2009 12:32:29 +0000 (13:32 +0100)]
Removes duplicate AppCache methods from WebCore.base.exp.
These methods were added in https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=
c60802dd50f86c37e0596d41c3ef6fc2c8804da4#patch1 and to webkit.org in http://trac.webkit.org/changeset/46344#file5.
They were then repositioned in webkit.org WebKit in http://trac.webkit.org/changeset/46449#file1. This caused them to be added as duplicates in the WebKit merge to r47029, in https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=
0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5#patch333.
This makes the Android version of the file identical to that from webkit.org.
Change-Id: I0554b1b9a8ffe43f6858cec69c3215d7bf7546e9
Grace Kloba [Tue, 20 Oct 2009 23:08:58 +0000 (16:08 -0700)]
Back in 02/08 when we added android_atomic_inc/dec, for
some reason, it missed define WTF_USE_LOCKFREE_THREADSAFESHARED.
So we are using mutexlocker instead of refcount inc/dec.
Even mutex version should work, but it is not exercised
by win/darwin/gcc. Changing to use refcount version fixed
the crash seen in picasaweb.
Fix http://b/issue?id=
2183371
Maybe fix http://b/issue?id=
2165237. But I can't verify
as I can't reproduce it even before my change.
Steve Block [Tue, 20 Oct 2009 21:42:47 +0000 (14:42 -0700)]
am
d8721145: Merge change I28a0470a into eclair-mr2
Merge commit '
d8721145fb61ddedbbf409e3bc4bdf17bba1ef17'
* commit '
d8721145fb61ddedbbf409e3bc4bdf17bba1ef17':
Update DerivedSourcesAllInOne to closer match webkit.org version.
Android (Google) Code Review [Tue, 20 Oct 2009 21:28:17 +0000 (17:28 -0400)]
Merge change I28a0470a into eclair-mr2
* changes:
Update DerivedSourcesAllInOne to closer match webkit.org version.
Patrick Scott [Tue, 20 Oct 2009 18:57:37 +0000 (11:57 -0700)]
Patrick Scott [Tue, 20 Oct 2009 15:30:21 +0000 (11:30 -0400)]
Fix spurious build breaks.
Split libwebcore.a into libwebcore.a and libjs.a and then link them together.
Steve Block [Tue, 20 Oct 2009 12:22:01 +0000 (13:22 +0100)]
Update DerivedSourcesAllInOne to closer match webkit.org version.
Change-Id: I28a0470a591bdad4fe410805b27979987669a9f2
Steve Block [Tue, 20 Oct 2009 09:42:15 +0000 (02:42 -0700)]
am
e17d040f: Merge webkit.org at R49305 : Update WebKit revision number.
Merge commit '
e17d040f55282982a172dd3836ead7a5a4b180fb'
* commit '
e17d040f55282982a172dd3836ead7a5a4b180fb':
Merge webkit.org at R49305 : Update WebKit revision number.
Steve Block [Tue, 20 Oct 2009 09:42:11 +0000 (02:42 -0700)]
am
e0d45363: Merge webkit.org at R49305 : Update rendering to use new overflow methods.
Merge commit '
e0d453637f1bc58e518a60882c1bdd04ae41d353'
* commit '
e0d453637f1bc58e518a60882c1bdd04ae41d353':
Merge webkit.org at R49305 : Update rendering to use new overflow methods.
Steve Block [Tue, 20 Oct 2009 09:42:07 +0000 (02:42 -0700)]
am
79d347c0: Merge webkit.org at R49305 : ImageBuffer::get/putImageData renamed to get/putUnmultipliedImageData.
Merge commit '
79d347c0fd069f65f8193cc0a1c041b39441c044'
* commit '
79d347c0fd069f65f8193cc0a1c041b39441c044':
Merge webkit.org at R49305 : ImageBuffer::get/putImageData renamed to get/putUnmultipliedImageData.
Steve Block [Tue, 20 Oct 2009 09:42:03 +0000 (02:42 -0700)]
am
db4aee97: Merge webkit.org at R49305 : Update CacheBuilder to use new event listener methods.
Merge commit '
db4aee9760c4b1e3cc14b24267a32cd66d550334'
* commit '
db4aee9760c4b1e3cc14b24267a32cd66d550334':
Merge webkit.org at R49305 : Update CacheBuilder to use new event listener methods.
Steve Block [Tue, 20 Oct 2009 09:41:59 +0000 (02:41 -0700)]
am
52fc9e2f: Merge webkit.org at R49305 : Stubs out new MediaPlayerPrivate::hasAudio method.
Merge commit '
52fc9e2feca3d1509acadbb04272896814078e22'
* commit '
52fc9e2feca3d1509acadbb04272896814078e22':
Merge webkit.org at R49305 : Stubs out new MediaPlayerPrivate::hasAudio method.
Steve Block [Tue, 20 Oct 2009 09:41:55 +0000 (02:41 -0700)]
am
6d0ea865: Merge webkit.org at R49305 : Stub out PluginView::halt and PluginView::restart.
Merge commit '
6d0ea8657f54a650eefa9438bf9e2f4c0709b534'
* commit '
6d0ea8657f54a650eefa9438bf9e2f4c0709b534':
Merge webkit.org at R49305 : Stub out PluginView::halt and PluginView::restart.
Steve Block [Tue, 20 Oct 2009 09:41:51 +0000 (02:41 -0700)]
am
d1368d75: Merge webkit.org at R49305 : Remove new file ImageSource.cpp from build.
Merge commit '
d1368d759438630fc877114bcab860030748cfee'
* commit '
d1368d759438630fc877114bcab860030748cfee':
Merge webkit.org at R49305 : Remove new file ImageSource.cpp from build.
Steve Block [Tue, 20 Oct 2009 09:41:47 +0000 (02:41 -0700)]
am
86cfdd09: Merge webkit.org at R49305 : Add ifdefs for enabler flags for V8 on Android.
Merge commit '
86cfdd09c85781ba25861c20984629b3b5fefa0d'
* commit '
86cfdd09c85781ba25861c20984629b3b5fefa0d':
Merge webkit.org at R49305 : Add ifdefs for enabler flags for V8 on Android.
Steve Block [Tue, 20 Oct 2009 09:41:43 +0000 (02:41 -0700)]
am
e2bca94a: Merge webkit.org at R49305 : Add includes for UNUSED_PARAM for V8.
Merge commit '
e2bca94a6deb58613400a85282dea37566fff097'
* commit '
e2bca94a6deb58613400a85282dea37566fff097':
Merge webkit.org at R49305 : Add includes for UNUSED_PARAM for V8.
Steve Block [Tue, 20 Oct 2009 09:41:39 +0000 (02:41 -0700)]
am
36a520dd: Merge webkit.org at R49305 : Remove superfluous call to FrameView::initScrollbars.
Merge commit '
36a520dd28b417e349eadd5404c4fac245e2d6b8'
* commit '
36a520dd28b417e349eadd5404c4fac245e2d6b8':
Merge webkit.org at R49305 : Remove superfluous call to FrameView::initScrollbars.
Steve Block [Tue, 20 Oct 2009 09:41:35 +0000 (02:41 -0700)]
am
b20ad8a2: Merge webkit.org at R49305 : Stub out methods for mixed content in FrameLoaderClientAndroid.
Merge commit '
b20ad8a215a2ab055647d0a026a8141b4bde7ca2'
* commit '
b20ad8a215a2ab055647d0a026a8141b4bde7ca2':
Merge webkit.org at R49305 : Stub out methods for mixed content in FrameLoaderClientAndroid.
Steve Block [Tue, 20 Oct 2009 09:41:31 +0000 (02:41 -0700)]
am
8e465e3d: Merge webkit.org at R49305 : Update Geolocation to use new EventListener methods.
Merge commit '
8e465e3d03d149943a3e592c3d2af395d50917eb'
* commit '
8e465e3d03d149943a3e592c3d2af395d50917eb':
Merge webkit.org at R49305 : Update Geolocation to use new EventListener methods.
Steve Block [Tue, 20 Oct 2009 09:41:27 +0000 (02:41 -0700)]
am
74e159b4: Merge webkit.org at R49305 : Use new macros to define Android touch event listeners for Node and DOMWindow.
Merge commit '
74e159b4f10c313c2347259bd2af0a9f81eb40c6'
* commit '
74e159b4f10c313c2347259bd2af0a9f81eb40c6':
Merge webkit.org at R49305 : Use new macros to define Android touch event listeners for Node and DOMWindow.
Steve Block [Tue, 20 Oct 2009 09:41:23 +0000 (02:41 -0700)]
am
3fc3c966: Merge webkit.org at R49305 : Remove stray definition of HTMLAnchorElement::isFocusable.
Merge commit '
3fc3c9665962d7fc405432fd04e5851516dd4cbe'
* commit '
3fc3c9665962d7fc405432fd04e5851516dd4cbe':
Merge webkit.org at R49305 : Remove stray definition of HTMLAnchorElement::isFocusable.
Steve Block [Tue, 20 Oct 2009 09:41:19 +0000 (02:41 -0700)]
am
8c231380: Merge webkit.org at R49305 : Pull WebKit change trac.webkit.org/changeset/49428 to fix build with ENABLE_INSPECTOR = 0.
Merge commit '
8c23138040b78914b1f9e2c4ea9a7765c258ec65'
* commit '
8c23138040b78914b1f9e2c4ea9a7765c258ec65':
Merge webkit.org at R49305 : Pull WebKit change http://trac.webkit.org/changeset/49428 to fix build with ENABLE_INSPECTOR = 0.
Steve Block [Tue, 20 Oct 2009 09:41:15 +0000 (02:41 -0700)]
am
72b26ecc: Merge webkit.org at R49305 : Include new InspectorTimelineAgent.h from InspectorControllerAndroid.
Merge commit '
72b26ecc49ccddf57e24b719c1f2a7fedae538c3'
* commit '
72b26ecc49ccddf57e24b719c1f2a7fedae538c3':
Merge webkit.org at R49305 : Include new InspectorTimelineAgent.h from InspectorControllerAndroid.
Steve Block [Tue, 20 Oct 2009 09:41:11 +0000 (02:41 -0700)]
am
10170b70: Merge webkit.org at R49305 : MediaPlayerPrivate::maxTimeBuffered renamed to buffered.
Merge commit '
10170b704c29772ec6c3fd4d7d19bdbae694dd4f'
* commit '
10170b704c29772ec6c3fd4d7d19bdbae694dd4f':
Merge webkit.org at R49305 : MediaPlayerPrivate::maxTimeBuffered renamed to buffered.
Steve Block [Tue, 20 Oct 2009 09:41:07 +0000 (02:41 -0700)]
am
bd6026bd: Merge webkit.org at R49305 : Text::string renamed to dataImpl.
Merge commit '
bd6026bd45e3421253a3bcdbaf61a4f7c08476ea'
* commit '
bd6026bd45e3421253a3bcdbaf61a4f7c08476ea':
Merge webkit.org at R49305 : Text::string renamed to dataImpl.
Steve Block [Tue, 20 Oct 2009 09:41:03 +0000 (02:41 -0700)]
am
d060767c: Merge webkit.org at R49305 : ChromeClient::platformWindow renamed to platformPageClient.
Merge commit '
d060767c4de6a275194ee9a58f151b82b17013bf'
* commit '
d060767c4de6a275194ee9a58f151b82b17013bf':
Merge webkit.org at R49305 : ChromeClient::platformWindow renamed to platformPageClient.
Steve Block [Tue, 20 Oct 2009 09:40:59 +0000 (02:40 -0700)]
am
f08b6f61: Merge webkit.org at R49305 : Add stub ChromeClient::scrollbarsModeDidChange method.
Merge commit '
f08b6f6172b9dd1defce51b868f951bcbf6c61c7'
* commit '
f08b6f6172b9dd1defce51b868f951bcbf6c61c7':
Merge webkit.org at R49305 : Add stub ChromeClient::scrollbarsModeDidChange method.
Steve Block [Tue, 20 Oct 2009 09:40:55 +0000 (02:40 -0700)]
am
80754947: Merge webkit.org at R49305 : Page constructor now takes a PluginHalterClient.
Merge commit '
80754947fdaad5fb6800b937f01f8d9ad53b4559'
* commit '
80754947fdaad5fb6800b937f01f8d9ad53b4559':
Merge webkit.org at R49305 : Page constructor now takes a PluginHalterClient.
Steve Block [Tue, 20 Oct 2009 09:40:50 +0000 (02:40 -0700)]
am
5f26944c: Merge webkit.org at R49305 : goBackOrForwards is now a member of Page.
Merge commit '
5f26944ca7d695d502778deeef7b20565bc3fa2e'
* commit '
5f26944ca7d695d502778deeef7b20565bc3fa2e':
Merge webkit.org at R49305 : goBackOrForwards is now a member of Page.
Steve Block [Tue, 20 Oct 2009 09:40:46 +0000 (02:40 -0700)]
am
059ea049: Merge webkit.org at R49305 : setLocalLoadPolicy is now a member of SecurityOrigin.
Merge commit '
059ea0497a87479c013371fb9f866f9f2677b529'
* commit '
059ea0497a87479c013371fb9f866f9f2677b529':
Merge webkit.org at R49305 : setLocalLoadPolicy is now a member of SecurityOrigin.
Steve Block [Tue, 20 Oct 2009 09:40:42 +0000 (02:40 -0700)]
am
d867a0e9: Merge webkit.org at R49305 : FrameLoader::stopLoading now uses an enum.
Merge commit '
d867a0e9b483e848580a3a98f73a8352884eac2b'
* commit '
d867a0e9b483e848580a3a98f73a8352884eac2b':
Merge webkit.org at R49305 : FrameLoader::stopLoading now uses an enum.
Steve Block [Tue, 20 Oct 2009 09:40:37 +0000 (02:40 -0700)]
am
035acba0: Merge webkit.org at R49305 : PolicyChecker is now factored out of FrameLoader.
Merge commit '
035acba057f2c7a0f9dbdf27af5c67f80f1614f2'
* commit '
035acba057f2c7a0f9dbdf27af5c67f80f1614f2':
Merge webkit.org at R49305 : PolicyChecker is now factored out of FrameLoader.
Steve Block [Tue, 20 Oct 2009 09:40:33 +0000 (02:40 -0700)]
am
8667eaf1: Merge webkit.org at R49305 : PluginView::init and destructor have been moved to common code.
Merge commit '
8667eaf175b0748a1d8783beeeecedfaa983a074'
* commit '
8667eaf175b0748a1d8783beeeecedfaa983a074':
Merge webkit.org at R49305 : PluginView::init and destructor have been moved to common code.
Steve Block [Tue, 20 Oct 2009 09:40:29 +0000 (02:40 -0700)]
am
8e1c14d2: Merge webkit.org at R49305 : Update String::copy call sites to use new copy method.
Merge commit '
8e1c14d2cd6633dac941b17af2bea9c045ee0140'
* commit '
8e1c14d2cd6633dac941b17af2bea9c045ee0140':
Merge webkit.org at R49305 : Update String::copy call sites to use new copy method.
Steve Block [Tue, 20 Oct 2009 09:40:25 +0000 (02:40 -0700)]
am
e372b0aa: Merge webkit.org at R49305 : Update KURL constructor call sites to new signature.
Merge commit '
e372b0aa0721bf108058f04c43ad1365058369b2'
* commit '
e372b0aa0721bf108058f04c43ad1365058369b2':
Merge webkit.org at R49305 : Update KURL constructor call sites to new signature.
Steve Block [Tue, 20 Oct 2009 09:40:21 +0000 (02:40 -0700)]
am
d9f79b2d: Merge webkit.org at R49305 : Add Android makefiles and set ENABLE flags.
Merge commit '
d9f79b2db2f5875a4c7d02da14a36205b205b4a7'
* commit '
d9f79b2db2f5875a4c7d02da14a36205b205b4a7':
Merge webkit.org at R49305 : Add Android makefiles and set ENABLE flags.
Steve Block [Tue, 20 Oct 2009 09:40:16 +0000 (02:40 -0700)]
am
3f252f84: Merge webkit.org at R49305 : Fix merge conflicts.
Merge commit '
3f252f84468859d129a8c6a9302412d2e6e5a3fa'
* commit '
3f252f84468859d129a8c6a9302412d2e6e5a3fa':
Merge webkit.org at R49305 : Fix merge conflicts.
Steve Block [Tue, 20 Oct 2009 09:40:10 +0000 (02:40 -0700)]
am
231d4e31: Merge webkit.org at R49305 : Automatic merge by git.
Merge commit '
231d4e3152a9c27a73b6ac7badbe6be673aa3ddf'
* commit '
231d4e3152a9c27a73b6ac7badbe6be673aa3ddf':
Merge webkit.org at R49305 : Automatic merge by git.
Steve Block [Wed, 14 Oct 2009 16:39:11 +0000 (17:39 +0100)]
Merge webkit.org at R49305 : Update WebKit revision number.
Change-Id: I7677f6573a8b952bc8a3cc43fc7825aea998644c
Steve Block [Mon, 12 Oct 2009 09:46:08 +0000 (10:46 +0100)]
Merge webkit.org at R49305 : Update rendering to use new overflow methods.
See http://trac.webkit.org/changeset?new=47440
Change-Id: I140b6be130c1fb175c653f5ba2ba19fdc323bbc9
Steve Block [Mon, 12 Oct 2009 14:44:20 +0000 (15:44 +0100)]
Merge webkit.org at R49305 : ImageBuffer::get/putImageData renamed to get/putUnmultipliedImageData.
See http://trac.webkit.org/changeset/47099
Change-Id: Ia282cb6a19fae8541f6dd9090ef87bcbc39feb64
Steve Block [Mon, 12 Oct 2009 12:52:11 +0000 (13:52 +0100)]
Merge webkit.org at R49305 : Update CacheBuilder to use new event listener methods.
See http://trac.webkit.org/changeset/48701
Change-Id: I627b40265f2aff72fdd4ad5884596be9820b642d
Steve Block [Mon, 12 Oct 2009 12:10:48 +0000 (13:10 +0100)]
Merge webkit.org at R49305 : Stubs out new MediaPlayerPrivate::hasAudio method.
See http://trac.webkit.org/changeset/47515
Change-Id: I18d3991e84c1a5760f736d04e16e1a195d5de283
Steve Block [Mon, 12 Oct 2009 14:36:56 +0000 (15:36 +0100)]
Merge webkit.org at R49305 : Stub out PluginView::halt and PluginView::restart.
See http://trac.webkit.org/changeset/49060
Change-Id: I1af14254d03b1a06c37c1081b12eddaab73fd5ab
Steve Block [Sun, 11 Oct 2009 22:16:05 +0000 (23:16 +0100)]
Merge webkit.org at R49305 : Remove new file ImageSource.cpp from build.
This file was added in http://trac.webkit.org/changeset/47073 to contain common ImageSource code.
We should refactor Android's ImageSource implementation to make use of this.
Change-Id: Ic9cde960ca96be697983d6b475156b592d82cfaa
Steve Block [Tue, 13 Oct 2009 21:43:52 +0000 (22:43 +0100)]
Merge webkit.org at R49305 : Add ifdefs for enabler flags for V8 on Android.
Change-Id: Ia05aafa843b1f9aaf3d4f43cad7d664bf9d497e6
Steve Block [Tue, 13 Oct 2009 21:40:55 +0000 (22:40 +0100)]
Merge webkit.org at R49305 : Add includes for UNUSED_PARAM for V8.
Change-Id: I7f3eb908f20782ef8fa07242b674648515c200f2
Steve Block [Mon, 12 Oct 2009 11:23:35 +0000 (12:23 +0100)]
Merge webkit.org at R49305 : Remove superfluous call to FrameView::initScrollbars.
See http://trac.webkit.org/changeset/48064
Change-Id: Ib71ad99fb66f3c4346aef06ec7d73286488e1195
Steve Block [Mon, 12 Oct 2009 11:23:49 +0000 (12:23 +0100)]
Merge webkit.org at R49305 : Stub out methods for mixed content in FrameLoaderClientAndroid.
See http://trac.webkit.org/changeset/48032
Change-Id: I2b4182ff87857d3dd374b34ffd1c9b46ca84db90
Steve Block [Tue, 13 Oct 2009 10:46:22 +0000 (11:46 +0100)]
Merge webkit.org at R49305 : Update Geolocation to use new EventListener methods.
See http://trac.webkit.org/changeset/48402, http://trac.webkit.org/changeset/48701 and http://trac.webkit.org/changeset/48767
Change-Id: Id32d80c62f71c98c6677d7cbe11ee2ffbdaeeff1
Steve Block [Fri, 9 Oct 2009 15:32:56 +0000 (16:32 +0100)]
Merge webkit.org at R49305 : Use new macros to define Android touch event listeners for Node and DOMWindow.
See http://trac.webkit.org/changeset/48701
Change-Id: I160099dd16b222e016c3414f2ce06adf5cf52573
Steve Block [Mon, 12 Oct 2009 14:30:04 +0000 (15:30 +0100)]
Merge webkit.org at R49305 : Remove stray definition of HTMLAnchorElement::isFocusable.
This method has been removed in the new version of WebKit. However, the automatic merge did not remove the definition as it had been moved within Android's HTMLAnchorElement.h to make it public rather than private.
Change-Id: I5956ba997d78dfa75729aa2836dc8d579b3eacb3
Steve Block [Mon, 12 Oct 2009 13:44:26 +0000 (14:44 +0100)]
Merge webkit.org at R49305 : Pull WebKit change trac.webkit.org/changeset/49428 to fix build with ENABLE_INSPECTOR = 0.
Change-Id: Id5cf30ed4a1753dc0659f405286fc66a76cae3c8
Steve Block [Fri, 9 Oct 2009 15:57:47 +0000 (16:57 +0100)]
Merge webkit.org at R49305 : Include new InspectorTimelineAgent.h from InspectorControllerAndroid.
See http://trac.webkit.org/changeset/48167
Change-Id: I4488eeeb081e999acdfb70e5230f78fd5059ba19
Steve Block [Mon, 12 Oct 2009 12:15:31 +0000 (13:15 +0100)]
Merge webkit.org at R49305 : MediaPlayerPrivate::maxTimeBuffered renamed to buffered.
See http://trac.webkit.org/changeset/48267
Change-Id: I29156a62ece53de135a730a21e0337e4e4b57bed
Steve Block [Mon, 12 Oct 2009 11:21:45 +0000 (12:21 +0100)]
Merge webkit.org at R49305 : Text::string renamed to dataImpl.
See http://trac.webkit.org/changeset/47313
Change-Id: Ic33083eedfc8468c171cd7af6f112aca0eeef615