OSDN Git Service
Android (Google) Code Review [Wed, 28 Oct 2009 17:47:37 +0000 (13:47 -0400)]
Merge change I998a5863 into eclair-mr2
* changes:
Use NPAPI headers from WebCore/bridge/ rather than those from V8Bindings/npapi/.
Steve Block [Mon, 26 Oct 2009 18:08:41 +0000 (18:08 +0000)]
Use NPAPI headers from WebCore/bridge/ rather than those from V8Bindings/npapi/.
The files in question are npapi.h and npruntime.h. The Android versions at
V8Bindings/npapi/ are identical to the WebKit versions, other than a couple of
trivial changes, which are accounted for in this patch.
Change-Id: I998a5863181283aa6153c84a745b1923d9b5721b
Android (Google) Code Review [Wed, 28 Oct 2009 16:51:53 +0000 (12:51 -0400)]
Merge change I8e7024d6 into eclair-mr2
* changes:
We were excluding device-width to fix http://b/issue?id=
1331654. But some mobile sites will have minimum pref width wider than the screen width, like in http://www.boygeniusreport.com/2009/10/23/motorola-droid-preview/.
Cary Clark [Wed, 28 Oct 2009 14:39:06 +0000 (10:39 -0400)]
pass the current cursor when computing the mouse position
Most of the time, the simulated mouse position can be
computed from the current cursor. But when the cursor
is changed, the current cursor info could be out of
date and generate a bus error.
fixes http://b/issue?id=
2061211
Steve Block [Wed, 28 Oct 2009 14:40:26 +0000 (14:40 +0000)]
Updates Geolocation to use a pair of maps to store watchers.
This reflects a recent change submitted to webkit.org (see
http://trac.webkit.org/changeset/50159). This came about in the
course of upstreaming the logic to make sure the error callback
is called when permissions have already been denied (see
http://trac.webkit.org/changeset/50190).
Also make some minor style and comment changes to reflect other
recent submissions to webkit.org.
This will avoid future merge conflicts.
Change-Id: Iafca02403b781bc2119e6e762cb04df396ca8c11
Android (Google) Code Review [Wed, 28 Oct 2009 14:17:28 +0000 (10:17 -0400)]
Merge change Ia17a9f02 into eclair-mr2
* changes:
Adds ScriptController::initializeThreading(), to allow initializeThreading() to be used with both JSC and V8 without the use of ifdefs.
Android (Google) Code Review [Wed, 28 Oct 2009 12:01:12 +0000 (08:01 -0400)]
Merge change I9f515e09 into eclair-mr2
* changes:
Brings V8 binding ifdef changes in to line with version submitted to webkit.org
Grace Kloba [Tue, 27 Oct 2009 22:15:48 +0000 (15:15 -0700)]
We were excluding device-width to fix b/issue?id=
1331654.
But some mobile sites will have minimum pref width
wider than the screen width, like in
http://www.boygeniusreport.com/2009/10/23/motorola-droid-preview/.
Now we are checking width() > screenWidth before wrapping at line 958,
there is no need to exclude the device-width case. Remove the
checking and both bugs should be fixed.
Leon Scroggins [Fri, 23 Oct 2009 20:14:33 +0000 (16:14 -0400)]
Allow touches to change the selection.
Fixes http://b/issue?id=
1650395 Lets touches change the selection
while ignoring changes from trackball events. When a touch puts
a textfield in focus, tell the WebTextView to set mOkayForFocusNotToMatch.
Requires a change in frameworks/base.
Android (Google) Code Review [Tue, 27 Oct 2009 18:06:09 +0000 (14:06 -0400)]
Merge change Ib24a54e5 into eclair-mr2
* changes:
Remove bad assert.
Derek Sollenberger [Tue, 27 Oct 2009 13:50:23 +0000 (09:50 -0400)]
changing how plugins gain/lose focus.
Previously we were keeping our own state in the UI thread to
determine when to send events to the plugin. This change removes
that logic and uses the document focus to determine when events
are to be sent. This also fixes problems with the plugins
occasionally not receiving lose focus events.
see bug http://b/
2033843
Cary Clark [Mon, 26 Oct 2009 19:47:34 +0000 (15:47 -0400)]
tweak select text
webkit changed the behavior of hitTestResultAtPoint; it used
to return the innermost node hit, but does so no longer.
Work around this by searching the returned node for a text
node.
Start the text detection one pixel lower. This fixes picking up
the first line of a link on m.msn.com.
Simplify the selection drawing. Share code between the arrow and
the i-beam. Center the i-beam on the arrow. Use relative path
construction to simplify the i-beam.
Add debugging.
Requires a companion change in frameworks/base
partially fixes http://b/issue?id=
1667690
Patrick Scott [Tue, 27 Oct 2009 14:39:57 +0000 (10:39 -0400)]
Remove bad assert.
The original assert was meant to assert that the body renderer layout state is
not modified during the expansion of the iframe. This can falsely fire if the
body renderer already needed a layout before the iframe expansion.
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 [Fri, 23 Oct 2009 11:43:55 +0000 (12:43 +0100)]
Adds ScriptController::initializeThreading(), to allow initializeThreading() to be used with both JSC and V8 without the use of ifdefs.
See https://bugs.webkit.org/show_bug.cgi?id=30678
This has now been upstreamed to webkit.org, so submitting to Android to avoid future merge conflicts.
Change-Id: Ia17a9f02060f04b11a8bffa367164162775516ba
Steve Block [Fri, 23 Oct 2009 09:28:40 +0000 (10:28 +0100)]
Brings V8 binding ifdef changes in to line with version submitted to webkit.org
See https://bugs.webkit.org/show_bug.cgi?id=30697
$ diff ~/WebKitToT/WebKit/WebCore/bindings/v8/DOMObjectsInclude.h WebCore/bindings/v8/DOMObjectsInclude.h
36d35
< #include "CanvasActiveInfo.h"
186a186,193
> #if ENABLE(GEOLOCATION)
> #include "Coordinates.h"
> #include "Geolocation.h"
> #include "Geoposition.h"
> #include "PositionError.h"
> #include "PositionErrorCallback.h"
> #endif
>
222a230,238
> #if PLATFORM(ANDROID)
> // TODO: Upstream TOUCH_EVENTS guard.
> #if ENABLE(TOUCH_EVENTS)
> #include "Touch.h"
> #include "TouchList.h"
> #include "TouchEvent.h"
> #endif
> #endif
>
$ diff ~/WebKitToT/WebKit/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp WebCore/bindings/v8/DerivedSourcesAllInOne.cpp
37d36
< #include "bindings/V8CanvasActiveInfo.cpp"
100a100
> #include "bindings/V8Geolocation.cpp"
190,
191d189
< #include "bindings/V8Notification.cpp"
< #include "bindings/V8NotificationCenter.cpp"
258d255
< #include "bindings/V8SharedWorkerContext.cpp"
366a364
> #include "bindings/V8SVGURIReference.cpp"
386a385,392
>
> #if PLATFORM(ANDROID)
> // TODO: Upstream NOTIFICATIONS guard.
> #if ENABLE(NOTIFICATIONS)
> #include "bindings/V8Notification.cpp"
> #include "bindings/V8NotificationCenter.cpp"
> #endif
> #endif
$ diff ~/WebKitToT/WebKit/WebCore/bindings/v8/V8Index.cpp WebCore/bindings/v8/V8Index.cpp
37d36
< #include "V8CanvasActiveInfo.h"
358a358
> #include "V8SVGURIReference.h"
392d391
< #include "V8SharedWorkerContext.h"
437a437,454
> #if PLATFORM(ANDROID)
> // TODO: Upstream these guards to webkit.org
> #if ENABLE(GEOLOCATION)
> #include "V8Coordinates.h"
> #include "V8Geolocation.h"
> #include "V8Geoposition.h"
> #include "V8PositionError.h"
> #endif
>
> #if ENABLE(TOUCH_EVENTS)
> #include "V8Touch.h"
> #include "V8TouchList.h"
> #include "V8TouchEvent.h"
> #endif
>
> #include "V8VoidCallback.h"
> #endif // PLATFORM(ANDROID)
>
$ diff ~/WebKitToT/WebKit/WebCore/bindings/v8/V8Index.h WebCore/bindings/v8/V8Index.h
448d447
< V(CANVASACTIVEINFO, CanvasActiveInfo) \
493a493,523
> #if ENABLE(GEOLOCATION)
> #define DOM_OBJECT_GEOLOCATION_TYPES(V) \
> V(COORDINATES, Coordinates) \
> V(GEOLOCATION, Geolocation) \
> V(GEOPOSITION, Geoposition) \
> V(POSITIONERROR, PositionError)
> #else
> #define DOM_OBJECT_GEOLOCATION_TYPES(V)
> #endif
>
> #if PLATFORM(ANDROID)
> // TODO: Upstream this guard.
> #if ENABLE(TOUCH_EVENTS)
> #define DOM_OBJECT_TOUCH_EVENT_TYPES(V) \
> V(TOUCHLIST, TouchList) \
> V(TOUCHEVENT, TouchEvent) \
> V(TOUCH, Touch)
> #else
> #define DOM_OBJECT_TOUCH_EVENT_TYPES(V)
> #endif
> #endif
>
> #if PLATFORM(ANDROID)
> #define DOM_OBJECT_VOIDCALLBACK_TYPES(V) \
> V(VOIDCALLBACK, VoidCallback)
> #else
> #define DOM_OBJECT_VOIDCALLBACK_TYPES(V)
> #endif
>
> #if PLATFORM(ANDROID)
> // This block is modified, but is not Android-specific.
502a533,535
> DOM_OBJECT_GEOLOCATION_TYPES(V) \
> DOM_OBJECT_TOUCH_EVENT_TYPES(V) \
> DOM_OBJECT_VOIDCALLBACK_TYPES(V) \
503a537
> #endif
Change-Id: I9f515e0918417879813f2ff8d67df16db9bae754
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.
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: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
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 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
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 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
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: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
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 [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.
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.
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 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 [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
Steve Block [Mon, 12 Oct 2009 10:52:54 +0000 (11:52 +0100)]
Merge webkit.org at R49305 : ChromeClient::platformWindow renamed to platformPageClient.
See http://trac.webkit.org/changeset/48511
Change-Id: I18ba9b6baa000209a28b8f1d01046c1c0e86c026
Steve Block [Mon, 12 Oct 2009 10:48:48 +0000 (11:48 +0100)]
Merge webkit.org at R49305 : Add stub ChromeClient::scrollbarsModeDidChange method.
See http://trac.webkit.org/changeset/47866
Change-Id: I28b535b2c0202db2ec6d36791f67de4bbf24c3b4
Steve Block [Mon, 12 Oct 2009 10:38:23 +0000 (11:38 +0100)]
Merge webkit.org at R49305 : Page constructor now takes a PluginHalterClient.
See http://trac.webkit.org/changeset/48748
Change-Id: I2dd80bcda65ad309fe9d3cd4d73e832d7d17467f
Steve Block [Mon, 12 Oct 2009 10:32:45 +0000 (11:32 +0100)]
Merge webkit.org at R49305 : goBackOrForwards is now a member of Page.
http://trac.webkit.org/changeset/49067
Change-Id: Ie15f56d2fa33f1d535ed5d048f0ac97c9d054271
Steve Block [Mon, 12 Oct 2009 10:29:26 +0000 (11:29 +0100)]
Merge webkit.org at R49305 : setLocalLoadPolicy is now a member of SecurityOrigin.
See http://trac.webkit.org/changeset/49211
Change-Id: I2386a1089f9212f523b5525e2c98b081fb7bf297
Steve Block [Mon, 12 Oct 2009 10:21:24 +0000 (11:21 +0100)]
Merge webkit.org at R49305 : FrameLoader::stopLoading now uses an enum.
See http://trac.webkit.org/changeset/48001
Change-Id: I11d6bae61de1f528ed8ee117c0260c78dccbd502
Steve Block [Mon, 12 Oct 2009 10:13:15 +0000 (11:13 +0100)]
Merge webkit.org at R49305 : PolicyChecker is now factored out of FrameLoader.
See http://trac.webkit.org/changeset/49284
Change-Id: I2aafe6f747f22b9c51c0db60f13fb3352d373809
Steve Block [Sun, 11 Oct 2009 22:28:11 +0000 (23:28 +0100)]
Merge webkit.org at R49305 : PluginView::init and destructor have been moved to common code.
See http://trac.webkit.org/changeset/47966 and http://trac.webkit.org/changeset/47967
Change-Id: If5b9594b032d5a7d456fe3bb6092eafef3655c34
Steve Block [Fri, 9 Oct 2009 16:07:41 +0000 (17:07 +0100)]
Merge webkit.org at R49305 : Update String::copy call sites to use new copy method.
See http://trac.webkit.org/changeset/49160
Change-Id: I75e1d6701f4d16fab7513f5924abf00e958e865c
Steve Block [Fri, 9 Oct 2009 14:48:35 +0000 (15:48 +0100)]
Merge webkit.org at R49305 : Update KURL constructor call sites to new signature.
See http://trac.webkit.org/changeset/47907
Change-Id: I0d2f17fb161254e62e835d52fe7ab482b11b054d
Steve Block [Fri, 9 Oct 2009 14:17:53 +0000 (15:17 +0100)]
Merge webkit.org at R49305 : Add Android makefiles and set ENABLE flags.
We disable INSPECTOR - See http://trac.webkit.org/changeset/48430
We disable EVENT_SOURCE - see http://trac.webkit.org/changeset/47323
Change-Id: Iab25b3bb56582d9df1e693ed7158338e953677b7
Steve Block [Fri, 9 Oct 2009 12:27:03 +0000 (13:27 +0100)]
Merge webkit.org at R49305 : Fix merge conflicts.
Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a
Steve Block [Thu, 8 Oct 2009 16:19:54 +0000 (17:19 +0100)]
Merge webkit.org at R49305 : Automatic merge by git.
Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
Android (Google) Code Review [Mon, 19 Oct 2009 18:25:02 +0000 (14:25 -0400)]
Merge change I5536af7a into eclair-mr2
* changes:
Updating the documentation for plugins.
Android (Google) Code Review [Mon, 19 Oct 2009 18:18:32 +0000 (14:18 -0400)]
Merge change I112445f3 into eclair-mr2
* changes:
return default 1.0 for scaleFactor(), since android doesn't record at the same res as it draws
Steve Block [Mon, 19 Oct 2009 16:25:42 +0000 (17:25 +0100)]
Removes some commented out files from the V8 derived Makefile.
Change-Id: I27567e104f8953b6858597a7f7a5f522b6203ac8
Derek Sollenberger [Mon, 19 Oct 2009 15:50:55 +0000 (11:50 -0400)]
Updating the documentation for plugins.
Mike Reed [Mon, 19 Oct 2009 14:50:14 +0000 (10:50 -0400)]
return default 1.0 for scaleFactor(), since android doesn't record at the same res as it draws
Steve Block [Mon, 19 Oct 2009 12:40:54 +0000 (13:40 +0100)]
Remove ARMAssembler.cpp from WebKit build, as it is not required on Android.
Change-Id: Ic5a299518e5ca51b6833e4c236b97c7ea7dbe4a7
Android (Google) Code Review [Fri, 16 Oct 2009 17:05:24 +0000 (13:05 -0400)]
Merge change I4419d5c4 into eclair-mr2
* changes:
Only write Geolocation permissions to the DB when required.
Steve Block [Fri, 16 Oct 2009 16:07:37 +0000 (17:07 +0100)]
Only write Geolocation permissions to the DB when required.
This fixes http://b/issue?id=
2167364
Android (Google) Code Review [Fri, 16 Oct 2009 14:51:57 +0000 (10:51 -0400)]
Merge change I6623a2fa into eclair-mr2
* changes:
don't pre-round rects, since we will zoom (arbitrarily) after we record the geometry.
Mike Reed [Fri, 16 Oct 2009 14:29:45 +0000 (10:29 -0400)]
don't pre-round rects, since we will zoom (arbitrarily) after we record the geometry.
This fixes the funny case of <canvas> elements being scaled twice: once by our scaleFactor() and
then again by this roundToDevicePixels method.
Cary Clark [Thu, 15 Oct 2009 17:22:12 +0000 (13:22 -0400)]
do not merge: fix copy/paste using trackball on passion
This fix is alrady in mr2. It does not affect sholes --
this is a trackball only bug.
The selection caret and arrow now take the scale factor and
the height of the title bar into account when preparing the
canvas for drawing.
Also, simply call to CopyPaste::findClosest, and remove
logic to attempt to pin the arrow to the current cursor.
Requires a companion fix in framework/base
Fixes http://b/issue?id=
2187591
Steve Block [Tue, 6 Oct 2009 11:52:52 +0000 (12:52 +0100)]
Fixes a couple of style problems and a minor TODO in WebKit Geolocation. Do not merge.
This has already been submitted to master branch.
Leon Scroggins [Thu, 15 Oct 2009 17:33:58 +0000 (13:33 -0400)]
Do not bring up the soft keyboard for readonly input fields.
Partial fix for http://b/issue?id=
2159869. Add a field to CachedNode
for readonly. In WebView.cpp, only call displaySoftKeyboard if the
node is not readonly. Also call displaySoftKeyboard in nativeTextMotionUp
to replace a call being removed in WebView.touchUpOnTextField(java).
Cary Clark [Thu, 15 Oct 2009 17:22:12 +0000 (13:22 -0400)]
fix copy/paste using trackball on passion
This fix should be considered for passion mr1, but
does not affect sholes -- this is a trackball only bug.
The selection caret and arrow now take the scale factor and
the height of the title bar into account when preparing the
canvas for drawing.
Also, simply call to CopyPaste::findClosest, and remove
logic to attempt to pin the arrow to the current cursor.
Requires a companion fix in framework/base
Fixes http://b/issue?id=
2187591
Steve Block [Thu, 8 Oct 2009 14:29:34 +0000 (15:29 +0100)]
Bring Geolocation V8 bindings in line with those for JSC. Do not merge.
This has already been submitted to master branch.
Steve Block [Thu, 8 Oct 2009 14:18:46 +0000 (15:18 +0100)]
Brings JSC Geolocation bindings up-to-date with latest submission to webkit.org. Do not merge.
See https://bugs.webkit.org/show_bug.cgi?id=29099
This has already been submitted to master branch.
Andrei Popescu [Tue, 6 Oct 2009 13:44:10 +0000 (14:44 +0100)]
Remove the Android guards added to the <video> implementation in WebCore. Do not merge.
The patch in https://bugs.webkit.org/show_bug.cgi?id=29133 landed.
This has already been submitted to master branch.
Steve Block [Thu, 8 Oct 2009 11:05:14 +0000 (12:05 +0100)]
Fixes an accidental change made to WebKit GTK code. Do not merge.
This was made in change
95e3d862bbab761f8caaf1d1b54065f67b9a5148.
See https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=
95e3d862bbab761f8caaf1d1b54065f67b9a5148#patch1
This will help avoid noise in the diffs when upstreaming Android-specific changes to webkit.org.
This has already been submitted to master branch.
Steve Block [Thu, 8 Oct 2009 10:13:05 +0000 (11:13 +0100)]
Fixes a bunch of WebKit whitespace discrepancies between Android and webkit.org. Do not merge.
This will avoid noise in the diffs when upstreaming Android-specific changes to webkit.org.
This has already been submitted to master branch.
Steve Block [Wed, 14 Oct 2009 13:09:10 +0000 (14:09 +0100)]
Update V8 to revision 3018.
Note that the latest version of WebKit requires V8 change http://code.google.com/p/v8/source/detail?r=2969 See http://trac.webkit.org/changeset/49248
Steve Block [Wed, 14 Oct 2009 09:26:48 +0000 (10:26 +0100)]
Remove more superfluous WebKit files from build.
Steve Block [Tue, 13 Oct 2009 22:34:42 +0000 (23:34 +0100)]
Remove superfluous files from JSC build. Note that these files are not in the V8 build.