OSDN Git Service
Leon Scroggins [Thu, 29 Oct 2009 12:56:31 +0000 (05:56 -0700)]
am
a3fb0891: Merge change I5d9ec169 into eclair-mr2
Merge commit '
a3fb08910591707d5aa75e687f546abec6358fcc'
* commit '
a3fb08910591707d5aa75e687f546abec6358fcc':
Pass PlatformKeyboardEvents for deletions.
Android (Google) Code Review [Thu, 29 Oct 2009 12:40:49 +0000 (08:40 -0400)]
Merge change I5d9ec169 into eclair-mr2
* changes:
Pass PlatformKeyboardEvents for deletions.
Grace Kloba [Thu, 29 Oct 2009 06:56:50 +0000 (23:56 -0700)]
am
6f172891: Merge change I47300b36 into eclair-mr2
Merge commit '
6f172891eaa14c0fc034daeba26efef699fe215d'
* commit '
6f172891eaa14c0fc034daeba26efef699fe215d':
fix instrumentation. The new WebKit has CachedResourceClient
Leon Scroggins [Thu, 29 Oct 2009 06:51:58 +0000 (23:51 -0700)]
Steve Block [Thu, 29 Oct 2009 06:49:08 +0000 (23:49 -0700)]
am
8c6c2864: Merge change I998a5863 into eclair-mr2
Merge commit '
8c6c2864439f5757f8e480c9b23f640baacb9f4f'
* commit '
8c6c2864439f5757f8e480c9b23f640baacb9f4f':
Use NPAPI headers from WebCore/bridge/ rather than those from V8Bindings/npapi/.
Grace Kloba [Thu, 29 Oct 2009 06:43:36 +0000 (23:43 -0700)]
am
4e71352f: Merge change I8e7024d6 into eclair-mr2
Merge commit '
4e71352fc03ff3e392a94407c2298c045b610311'
* commit '
4e71352fc03ff3e392a94407c2298c045b610311':
We were excluding device-width to fix http://b/issue?id=
1331654.
Cary Clark [Thu, 29 Oct 2009 06:43:29 +0000 (23:43 -0700)]
am
7b035dc1: pass the current cursor when computing the mouse position
Merge commit '
7b035dc1012763a04adddc6de25256647fea50bd'
* commit '
7b035dc1012763a04adddc6de25256647fea50bd':
pass the current cursor when computing the mouse position
Steve Block [Thu, 29 Oct 2009 06:43:13 +0000 (23:43 -0700)]
am
466006e4: Updates Geolocation to use a pair of maps to store watchers.
Merge commit '
466006e4a13fd557d7b35c1fe0b7a38384e5ce2e'
* commit '
466006e4a13fd557d7b35c1fe0b7a38384e5ce2e':
Updates Geolocation to use a pair of maps to store watchers.
Steve Block [Thu, 29 Oct 2009 06:43:05 +0000 (23:43 -0700)]
am
0ddb5835: Merge change Ia17a9f02 into eclair-mr2
Merge commit '
0ddb5835faa6cd39067b2a777ea9123a7f0a6ab1'
* commit '
0ddb5835faa6cd39067b2a777ea9123a7f0a6ab1':
Adds ScriptController::initializeThreading(), to allow initializeThreading() to be used with both JSC and V8 without the use of ifdefs.
Steve Block [Thu, 29 Oct 2009 06:42:56 +0000 (23:42 -0700)]
am
68f795fe: Merge change I9f515e09 into eclair-mr2
Merge commit '
68f795feee72509a25c327be4f04835459439fa2'
* commit '
68f795feee72509a25c327be4f04835459439fa2':
Brings V8 binding ifdef changes in to line with version submitted to webkit.org
Leon Scroggins [Wed, 28 Oct 2009 21:52:13 +0000 (17:52 -0400)]
Pass PlatformKeyboardEvents for deletions.
Instead of using TypingCommand::deleteSelection, use events so
the javascript events happen, allowing autocomplete fields to work
properly.
Fixes http://b/issue?id=
2059795
Android (Google) Code Review [Wed, 28 Oct 2009 20:43:08 +0000 (16:43 -0400)]
Merge change I47300b36 into eclair-mr2
* changes:
fix instrumentation. The new WebKit has CachedResourceClient derived from FastAllocBase which has overload operator new. So we need to override it again to avoid ambiguous.
Leon Scroggins [Wed, 28 Oct 2009 18:25:19 +0000 (14:25 -0400)]
Fix a clicking bug.
Remove some code that simulates a mouse click at the beginning of
a textarea and the end of a textfield. The original goal was to
make the click change the selection to be at the beginning or end
of the field, respectively. However, we actually make another call
which prevents this click from the selection. Further, the
selection actually gets changed elsewhere.
Fixes http://b/issue?id=
2219233
Grace Kloba [Wed, 28 Oct 2009 06:38:13 +0000 (23:38 -0700)]
fix instrumentation. The new WebKit has CachedResourceClient
derived from FastAllocBase which has overload operator new.
So we need to override it again to avoid ambiguous.
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
Elliott Hughes [Tue, 27 Oct 2009 23:15:10 +0000 (16:15 -0700)]
Fix build.
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 [Tue, 27 Oct 2009 20:39:18 +0000 (13:39 -0700)]
am
f74580c1: Allow touches to change the selection.
Merge commit '
f74580c1504dcdd43fd15995b0e137982512dba2'
* commit '
f74580c1504dcdd43fd15995b0e137982512dba2':
Allow touches to change the selection.
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 19:19:47 +0000 (15:19 -0400)]
Merge change Ieb2fbf7a
* changes:
Use native weak references instead of our wrapper.
Patrick Scott [Tue, 27 Oct 2009 19:09:59 +0000 (12:09 -0700)]
am
64d1f380: Merge change Ib24a54e5 into eclair-mr2
Merge commit '
64d1f380c954e4c93433fae705c6f27607f1d922'
* commit '
64d1f380c954e4c93433fae705c6f27607f1d922':
Remove bad assert.
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.
Patrick Scott [Thu, 22 Oct 2009 16:14:01 +0000 (12:14 -0400)]
Use native weak references instead of our wrapper.
Revert "Add check null of getRealObject(). When a WebView is"
This reverts commit
b47ea2b1184167767692f88c1e5f3e4e89db04b2.
Revert "Update the comment for checking null in needtouchevents."
This reverts commit
1e67e45d20ead40b0407618abbc5e20840dc3c80.
Revert "Check null for WebViewCore's nativeClass before calling"
This reverts commit
992afbebfb735ec2dd52b4166c22ab55827d88ed.
Fix a few places where DeleteLocalRef and DeleteGlobalRef were used incorrectly.
Fix a compilation warning as well.
Derek Sollenberger [Tue, 27 Oct 2009 15:34:49 +0000 (08:34 -0700)]
am
c7d90905: changing how plugins gain/lose focus.
Merge commit '
c7d9090583638605a2c8a779642ad09d1a228520'
* commit '
c7d9090583638605a2c8a779642ad09d1a228520':
changing how plugins gain/lose focus.
Cary Clark [Tue, 27 Oct 2009 15:17:05 +0000 (08:17 -0700)]
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.
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 [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
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.