OSDN Git Service
Grace Kloba [Fri, 15 Jan 2010 02:17:48 +0000 (18:17 -0800)]
am
b8a54826: Don\'t use static jclass unless we hold a reference.
Merge commit '
b8a548263905542f52acfc60682693972f098d25' into eclair-mr2-plus-aosp
* commit '
b8a548263905542f52acfc60682693972f098d25':
Don't use static jclass unless we hold a reference.
Grace Kloba [Fri, 15 Jan 2010 02:05:46 +0000 (18:05 -0800)]
Don't use static jclass unless we hold a reference.
Fix the crash.
Nicolas Roard [Thu, 14 Jan 2010 21:13:37 +0000 (13:13 -0800)]
am
388e461f: Add proper support for fixed position elements
Merge commit '
388e461f3d6bf782b3cfb4bb21bc6264cef9323c' into eclair-mr2-plus-aosp
* commit '
388e461f3d6bf782b3cfb4bb21bc6264cef9323c':
Add proper support for fixed position elements
Nicolas Roard [Thu, 7 Jan 2010 14:22:22 +0000 (14:22 +0000)]
Add proper support for fixed position elements
this is two-part change, see http://android-git.corp.google.com/g/#change,37092 for the java counterpart.
This CL implements fixed position elements (css position: fixed) using layers, supporting pixels and percent lengths.
It addresses http://b/
1914365
Nicolas Roard [Thu, 14 Jan 2010 21:06:14 +0000 (13:06 -0800)]
am
29b325cb: Fix \'disappearing layers\' bug (see b/
2371053)
Merge commit '
29b325cb949b1a41ac8bdeaa77977fcd342aec31' into eclair-mr2-plus-aosp
* commit '
29b325cb949b1a41ac8bdeaa77977fcd342aec31':
Fix 'disappearing layers' bug (see http://b/
2371053)
Nicolas Roard [Thu, 14 Jan 2010 15:43:16 +0000 (15:43 +0000)]
Fix 'disappearing layers' bug (see b/
2371053)
The removed code was needed in the previous implementation, but not so anymore as we
recopy the layers to the UI. It causes the bug, as webkit deallocate the tree asynchronously,
which ends up resetting the root layer to zero after the new page was loaded...
Steve Block [Thu, 14 Jan 2010 12:43:00 +0000 (04:43 -0800)]
am
44364d80: Merge "Update jni_runtime.cpp with the latest changes to appendClassName." into eclair-mr2
Merge commit '
44364d809fca0d73d06341b521532e85c4c0168b' into eclair-mr2-plus-aosp
* commit '
44364d809fca0d73d06341b521532e85c4c0168b':
Update jni_runtime.cpp with the latest changes to appendClassName.
Steve Block [Thu, 14 Jan 2010 12:40:20 +0000 (04:40 -0800)]
Merge "Update jni_runtime.cpp with the latest changes to appendClassName." into eclair-mr2
Steve Block [Thu, 14 Jan 2010 11:49:41 +0000 (03:49 -0800)]
am
a48cb1ea: Merge "Move general includes before bindings includes." into eclair-mr2
Merge commit '
a48cb1eae11a1592dfa6fbe6c33af1cec74a56b5' into eclair-mr2-plus-aosp
* commit '
a48cb1eae11a1592dfa6fbe6c33af1cec74a56b5':
Move general includes before bindings includes.
Steve Block [Thu, 14 Jan 2010 11:38:15 +0000 (03:38 -0800)]
Merge "Move general includes before bindings includes." into eclair-mr2
Steve Block [Thu, 14 Jan 2010 10:52:53 +0000 (10:52 +0000)]
Update jni_runtime.cpp with the latest changes to appendClassName.
WebKit change http://trac.webkit.org/changeset/53193 updated appendClassName to use
JSC::StringBuilder, rather than JSC-specific types. This allows this method to be
used with V8 as well as JSC.
A clean cherry-pick of this change would require changes 52026, 52028, 52075 and
52329 to be cherry-picked also. To avoid this churn, we simply update jni_runtime.cpp
to reflect the version at change 53193.
Change-Id: I6602469aeea59d8146ab1e72f312888b77522406
Steve Block [Wed, 13 Jan 2010 17:13:01 +0000 (17:13 +0000)]
Move general includes before bindings includes.
This avoids problems with collisions between WebCore/platform/text/StringBuilder.h and the new
JavaScriptCore/runtime/StringBuilder.h. The latter is added in WebKit change 52075, so will be
picked up in the next WebKit merge. We may also cherry-pick the changes which add this file
as they are relevant to upstreaming in WebCore/bridge.
In WebCore, we want '#include "StringBuilder.h"' to pick up the WebCore StringBuilder.h. However, when
building WebCore for JSC, we need JavaScriptCore/runtime on the include path so that the JSC headers
are picked up correctly. This change puts JavaScriptCore/runtime and other bindings includes after the
WebCore and other general includes, so that the WebCore StringBuilder.h is picked up.
This was upstreamed to webkit.org in http://trac.webkit.org/changeset/53254
Change-Id: I1b20b6d457f1d5d1f08764ff0b537058e0742835
Patrick Scott [Wed, 13 Jan 2010 19:37:41 +0000 (11:37 -0800)]
am
6916255e: Call into MimeTypeMap to get the mime type for an extension.
Merge commit '
6916255e3bc5760bcaac2ec7d5057e057bd3de6a' into eclair-mr2-plus-aosp
* commit '
6916255e3bc5760bcaac2ec7d5057e057bd3de6a':
Call into MimeTypeMap to get the mime type for an extension.
Patrick Scott [Wed, 13 Jan 2010 19:10:56 +0000 (14:10 -0500)]
Call into MimeTypeMap to get the mime type for an extension.
Use the default method to obtain the content type of a plugin. Implement
extension to mime type by calling into the java map.
Requires a small change to the webkit package.
Bug:
2368893
Leon Scroggins [Tue, 12 Jan 2010 22:21:37 +0000 (14:21 -0800)]
am
ab9c9800: Merge "Compare Node pointers rather than CachedNode pointers." into eclair-mr2
Merge commit '
ab9c9800ae22385fd019e1f6a366fc5346d041aa' into eclair-mr2-plus-aosp
* commit '
ab9c9800ae22385fd019e1f6a366fc5346d041aa':
Compare Node pointers rather than CachedNode pointers.
Leon Scroggins [Tue, 12 Jan 2010 22:17:03 +0000 (14:17 -0800)]
Merge "Compare Node pointers rather than CachedNode pointers." into eclair-mr2
Leon Scroggins [Tue, 12 Jan 2010 20:42:27 +0000 (15:42 -0500)]
Compare Node pointers rather than CachedNode pointers.
Fixes http://b/issue?id=
2369028
Derek Sollenberger [Tue, 12 Jan 2010 20:19:00 +0000 (12:19 -0800)]
am
f8ffa7ae: Merge "adding event to notify the plugin when it is on/off screen." into eclair-mr2
Merge commit '
f8ffa7aeb28d4325cdeb0d7bddcf9397d761f97f' into eclair-mr2-plus-aosp
* commit '
f8ffa7aeb28d4325cdeb0d7bddcf9397d761f97f':
adding event to notify the plugin when it is on/off screen.
Leon Scroggins [Tue, 12 Jan 2010 20:17:31 +0000 (12:17 -0800)]
am
9fb6b3c3: Ensure that the current textfield is actually a textfield before treating it like one.
Merge commit '
9fb6b3c382612e4284ca9bd38930ab94053b8888' into eclair-mr2-plus-aosp
* commit '
9fb6b3c382612e4284ca9bd38930ab94053b8888':
Ensure that the current textfield is actually a textfield before treating it like one.
Derek Sollenberger [Tue, 12 Jan 2010 20:12:11 +0000 (12:12 -0800)]
Merge "adding event to notify the plugin when it is on/off screen." into eclair-mr2
Leon Scroggins [Tue, 12 Jan 2010 19:38:39 +0000 (14:38 -0500)]
Ensure that the current textfield is actually a textfield before treating it like one.
Fix for http://b/issue?id=
2368868
Derek Sollenberger [Tue, 12 Jan 2010 19:08:24 +0000 (14:08 -0500)]
adding event to notify the plugin when it is on/off screen.
Derek Sollenberger [Mon, 11 Jan 2010 21:11:22 +0000 (13:11 -0800)]
am
838afd1b: consolidating to only use one surface per plugin. give plugin access to java context.
Merge commit '
838afd1be683057ebaf5cf85359bf9a567602b7b' into eclair-mr2-plus-aosp
* commit '
838afd1be683057ebaf5cf85359bf9a567602b7b':
consolidating to only use one surface per plugin. give plugin access to java context.
Derek Sollenberger [Mon, 11 Jan 2010 17:49:19 +0000 (12:49 -0500)]
consolidating to only use one surface per plugin. give plugin access to java context.
There is a companion commit in frameworks/base.
Leon Scroggins [Mon, 11 Jan 2010 14:42:24 +0000 (06:42 -0800)]
am
d485d47c: Bring up the IME after receiving a response from webkit.
Merge commit '
d485d47cbb03ae8cbe9d96bc54a5cb83ee80570e' into eclair-mr2-plus-aosp
* commit '
d485d47cbb03ae8cbe9d96bc54a5cb83ee80570e':
Bring up the IME after receiving a response from webkit.
Leon Scroggins [Fri, 8 Jan 2010 21:22:09 +0000 (16:22 -0500)]
Bring up the IME after receiving a response from webkit.
Fix for http://b/issue?id=
2361658
Requires a change to frameworks/base.
Steve Block [Fri, 8 Jan 2010 17:18:06 +0000 (09:18 -0800)]
am
ee0e4a35: Merge "Updates the use of weak references in the script-to-Java bridge for V8." into eclair-mr2
Merge commit '
ee0e4a35152a822ebac039808db1a4c33f02f7ee' into eclair-mr2-plus-aosp
* commit '
ee0e4a35152a822ebac039808db1a4c33f02f7ee':
Updates the use of weak references in the script-to-Java bridge for V8.
Steve Block [Fri, 8 Jan 2010 17:15:31 +0000 (09:15 -0800)]
Merge "Updates the use of weak references in the script-to-Java bridge for V8." into eclair-mr2
Steve Block [Fri, 18 Dec 2009 12:28:23 +0000 (12:28 +0000)]
Updates the use of weak references in the script-to-Java bridge for V8.
Currently, V8 uses weak references to the Java object owned by JObjectWrapper.
This is in contrast to JSC, which uses strong references in JObjectWrapper.
However, for the special-case where JObjectWrapper is used in JavaInstance in
WebCoreFrameBridge, JSC uses WeakJavaInstance to swap the strong references for
weak references.
This change updates the V8 version of JObjectWrapper to use strong references
to match the JSC version. To maintain the weak reference behavior where
JObjectWrapper is used in JavaInstance in WebCoreFrameBridge, V8 now make use of
WeakJavaInstance too. This requires changes to jni_npobject to call the
necessary methods on JavaInstance to swap the references when the object is
accessed.
Change-Id: I3724d7e6437588feb0268a2670b02a93b52e54f0
Steve Block [Fri, 8 Jan 2010 12:49:11 +0000 (04:49 -0800)]
am
5cf18d3a: Merge "Updates V8 version of JavaInstance to use RefCounted, rather than implementing custom ref and deref methods." into eclair-mr2
Merge commit '
5cf18d3a4942dd7fba1f03621d53d66412b1b3df' into eclair-mr2-plus-aosp
* commit '
5cf18d3a4942dd7fba1f03621d53d66412b1b3df':
Updates V8 version of JavaInstance to use RefCounted, rather than implementing custom ref and deref methods.
Steve Block [Fri, 8 Jan 2010 12:41:56 +0000 (04:41 -0800)]
Merge "Updates V8 version of JavaInstance to use RefCounted, rather than implementing custom ref and deref methods." into eclair-mr2
Leon Scroggins [Thu, 7 Jan 2010 20:38:02 +0000 (12:38 -0800)]
am
15f1e443: In motionUp, update the CachedHistory\'s mMouseBounds.
Merge commit '
15f1e443f22288ee82cde972517ebf3cc1153d97' into eclair-mr2-plus-aosp
* commit '
15f1e443f22288ee82cde972517ebf3cc1153d97':
In motionUp, update the CachedHistory's mMouseBounds.
Leon Scroggins [Thu, 7 Jan 2010 20:19:19 +0000 (15:19 -0500)]
In motionUp, update the CachedHistory's mMouseBounds.
mMouseBounds is later used to determine the point of clicking.
Fixes http://b/issue?id=
2313991
Cary Clark [Thu, 7 Jan 2010 18:20:08 +0000 (10:20 -0800)]
am
1ccac4c1: remove unused jni interfaces
Merge commit '
1ccac4c182607275cdb16213493afa414f0d365e' into eclair-mr2-plus-aosp
* commit '
1ccac4c182607275cdb16213493afa414f0d365e':
remove unused jni interfaces
Cary Clark [Thu, 7 Jan 2010 16:49:50 +0000 (11:49 -0500)]
remove unused jni interfaces
companion change is in frameworks/base
Leon Scroggins [Thu, 7 Jan 2010 13:46:34 +0000 (05:46 -0800)]
am
725b72d9: Request <label> info only when accessing a textfield.
Merge commit '
725b72d96731765ddc964c620a2c98834946241f' into eclair-mr2-plus-aosp
* commit '
725b72d96731765ddc964c620a2c98834946241f':
Request <label> info only when accessing a textfield.
Leon Scroggins [Wed, 6 Jan 2010 22:06:11 +0000 (17:06 -0500)]
Request <label> info only when accessing a textfield.
Previously, we were storing the label info each time we build the
navigation cache.
Requires a change to frameworks/base.
Leon Scroggins [Wed, 6 Jan 2010 21:46:16 +0000 (13:46 -0800)]
am
e5e9720d: In findBestHitAt, set x and y to the intersection of slop and cursor.
Merge commit '
e5e9720d88df20ad1116d709ec078cec419ffcf4' into eclair-mr2-plus-aosp
* commit '
e5e9720d88df20ad1116d709ec078cec419ffcf4':
In findBestHitAt, set x and y to the intersection of slop and cursor.
Leon Scroggins [Wed, 6 Jan 2010 21:46:10 +0000 (13:46 -0800)]
am
62d9c8e5: Store label information to be used for hint text.
Merge commit '
62d9c8e597ebe68adce93008597730a41a1d716b' into eclair-mr2-plus-aosp
* commit '
62d9c8e597ebe68adce93008597730a41a1d716b':
Store label information to be used for hint text.
Leon Scroggins [Wed, 6 Jan 2010 15:49:08 +0000 (10:49 -0500)]
In findBestHitAt, set x and y to the intersection of slop and cursor.
Fixes http://b/issue?id=
2201866
Leon Scroggins [Tue, 5 Jan 2010 15:56:57 +0000 (10:56 -0500)]
Store label information to be used for hint text.
Fix for http://b/issue?id=
2331526
Requires a change to frameworks/base.
Nicolas Roard [Mon, 4 Jan 2010 20:38:43 +0000 (12:38 -0800)]
am
3bacb88b: Revert to ENABLE_ORIENTATION_EVENTS=1
Merge commit '
3bacb88ba1ca0b7bbce5b16b832cc5acd411e1f9' into eclair-mr2-plus-aosp
* commit '
3bacb88ba1ca0b7bbce5b16b832cc5acd411e1f9':
Revert to ENABLE_ORIENTATION_EVENTS=1
Nicolas Roard [Mon, 4 Jan 2010 19:46:12 +0000 (19:46 +0000)]
Revert to ENABLE_ORIENTATION_EVENTS=1
Nicolas Roard [Mon, 4 Jan 2010 19:41:10 +0000 (11:41 -0800)]
am
9acd586e: webkit layers support
Merge commit '
9acd586e4a0aa54e4f630665aa0d3c8c95b78e72' into eclair-mr2-plus-aosp
* commit '
9acd586e4a0aa54e4f630665aa0d3c8c95b78e72':
webkit layers support
Nicolas Roard [Mon, 4 Jan 2010 19:33:17 +0000 (19:33 +0000)]
webkit layers support
Leon Scroggins [Mon, 4 Jan 2010 15:33:11 +0000 (07:33 -0800)]
am
5bd553b6: Merge "If the DOM changes textfield focus, make the IME work properly." into eclair-mr2
Merge commit '
5bd553b63661fa0f711bb9c02566d5df80a9432f' into eclair-mr2-plus-aosp
* commit '
5bd553b63661fa0f711bb9c02566d5df80a9432f':
If the DOM changes textfield focus, make the IME work properly.
Steve Block [Mon, 4 Jan 2010 15:31:12 +0000 (07:31 -0800)]
am
edb4aa51: Merge "Cherry-picks a WebKit change to revert recent changes to String addition for JSC." into eclair-mr2
Merge commit '
edb4aa515ddaa7a5832d7c2896cb0ed9f7dcbbf0' into eclair-mr2-plus-aosp
* commit '
edb4aa515ddaa7a5832d7c2896cb0ed9f7dcbbf0':
Cherry-picks a WebKit change to revert recent changes to String addition for JSC.
Leon Scroggins [Mon, 4 Jan 2010 15:27:55 +0000 (07:27 -0800)]
Merge "If the DOM changes textfield focus, make the IME work properly." into eclair-mr2
Steve Block [Mon, 4 Jan 2010 15:20:25 +0000 (07:20 -0800)]
Merge "Cherry-picks a WebKit change to revert recent changes to String addition for JSC." into eclair-mr2
Steve Block [Mon, 4 Jan 2010 12:50:03 +0000 (12:50 +0000)]
Cherry-picks a WebKit change to revert recent changes to String addition for JSC.
WebKit change http://trac.webkit.org/changeset/51975 modified String addition in
JSC to use ropes. However, the change was incorrect, so was rolled back in
http://trac.webkit.org/changeset/51978.
The last WebKit merge was to revision r51976, so picked up the initial, broken
change only.
This change cherry-picks http://trac.webkit.org/changeset/51978 to revert the
original change.
Bug:
2336856
Change-Id: I7f48bce6a7f605779424ba0a7601524ab3a71990
Leon Scroggins [Tue, 15 Dec 2009 21:33:28 +0000 (16:33 -0500)]
If the DOM changes textfield focus, make the IME work properly.
Fix for http://b/issue?id=
2219166
Requires a change to frameworks/base
Remove the old change to update the WebTextView when a key is pressed,
since the IME does not generate key events. Instead, when the focus
changes, and the IME is serving the WebTextView, immediately clear
the cursor and update the WebTextView, so the user can continue
typing. Also, allow "Next" to work on the currently focused
textfield, even if it's not the cursor. Further, check for
a new action if there is a focus but not a cursor.
Steve Block [Wed, 30 Dec 2009 13:37:15 +0000 (13:37 +0000)]
Updates V8 version of JavaInstance to use RefCounted, rather than implementing custom ref and deref methods.
Change-Id: I9cc775224edcda65884461eaf0f4ff7efb5922be
Derek Sollenberger [Fri, 18 Dec 2009 16:49:14 +0000 (08:49 -0800)]
am
626f2058: Merge change Iab49f046 into eclair-mr2
Merge commit '
626f2058a8302d9e9770d3df2f9677344adb02d9' into eclair-mr2-plus-aosp
* commit '
626f2058a8302d9e9770d3df2f9677344adb02d9':
Fix to ensure plugin is notified even when the screen width does not change.
Android (Google) Code Review [Fri, 18 Dec 2009 16:46:32 +0000 (08:46 -0800)]
Merge change Iab49f046 into eclair-mr2
* changes:
Fix to ensure plugin is notified even when the screen width does not change.
Steve Block [Fri, 18 Dec 2009 14:44:02 +0000 (06:44 -0800)]
am
84a47995: Merge change I21d39461 into eclair-mr2
Merge commit '
84a4799558b021d8ab6c19a7fa787e2731aa1fe3' into eclair-mr2-plus-aosp
* commit '
84a4799558b021d8ab6c19a7fa787e2731aa1fe3':
Adds a 'using namespace JSC::Bindings;' declaration in WebCoreFrameBridge.
Android (Google) Code Review [Fri, 18 Dec 2009 14:41:41 +0000 (06:41 -0800)]
Merge change I21d39461 into eclair-mr2
* changes:
Adds a 'using namespace JSC::Bindings;' declaration in WebCoreFrameBridge.
Derek Sollenberger [Fri, 18 Dec 2009 14:01:01 +0000 (09:01 -0500)]
Fix to ensure plugin is notified even when the screen width does not change.
Steve Block [Fri, 18 Dec 2009 12:22:36 +0000 (12:22 +0000)]
Adds a 'using namespace JSC::Bindings;' declaration in WebCoreFrameBridge.
Also fixes some style issues.
Change-Id: I21d39461b488a5f490ea3557b24fe1674903c286
Steve Block [Fri, 18 Dec 2009 10:15:04 +0000 (02:15 -0800)]
am
6c4eb7eb: Merge change I49687314 into eclair-mr2
Merge commit '
6c4eb7eb3d9d196ca2c9b1589aa2d6d9924114b6' into eclair-mr2-plus-aosp
* commit '
6c4eb7eb3d9d196ca2c9b1589aa2d6d9924114b6':
Fixes a Geolocation bug with cached positions.
Android (Google) Code Review [Fri, 18 Dec 2009 10:11:06 +0000 (02:11 -0800)]
Merge change I49687314 into eclair-mr2
* changes:
Fixes a Geolocation bug with cached positions.
Steve Block [Thu, 17 Dec 2009 18:18:00 +0000 (10:18 -0800)]
am
2fb528f4: Adds notes to upstream feature guards added in V8DOMWrapper.cpp.
Merge commit '
2fb528f4cf4b88d350947cec509672a40d1aa9fb' into eclair-mr2-plus-aosp
* commit '
2fb528f4cf4b88d350947cec509672a40d1aa9fb':
Adds notes to upstream feature guards added in V8DOMWrapper.cpp.
Steve Block [Tue, 15 Dec 2009 15:45:02 +0000 (15:45 +0000)]
Adds notes to upstream feature guards added in V8DOMWrapper.cpp.
Change-Id: Id7659cfcab17f24e48958086b4206b1906562d74
Steve Block [Wed, 16 Dec 2009 12:57:38 +0000 (12:57 +0000)]
Fixes a Geolocation bug with cached positions.
In the case where a watch request returns a cached position, we must clear the cached position to prevent it from being used repeatedly in the case where the watch timer later fires.
Also cleans up some code and adds some comments.
This will be upstreamed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=30676
Change-Id: I4968731453c3dfd34a8d3466fdaee91d4c4158be
Steve Block [Thu, 17 Dec 2009 17:57:05 +0000 (09:57 -0800)]
am
7a747c0b: Merge webkit.org at r51976 : Update WebKit revision number.
Merge commit '
7a747c0b98a39b08f04bfbf16595228a6c841541' into eclair-mr2-plus-aosp
* commit '
7a747c0b98a39b08f04bfbf16595228a6c841541':
Merge webkit.org at r51976 : Update WebKit revision number.
Steve Block [Thu, 17 Dec 2009 17:57:01 +0000 (09:57 -0800)]
am
dda7a494: Merge webkit.org at r51976 : ColorSpace type has been removed.
Merge commit '
dda7a4941593717cc8e59c2e1a54ff00dfe5af0f' into eclair-mr2-plus-aosp
* commit '
dda7a4941593717cc8e59c2e1a54ff00dfe5af0f':
Merge webkit.org at r51976 : ColorSpace type has been removed.
Steve Block [Thu, 17 Dec 2009 17:56:56 +0000 (09:56 -0800)]
am
9d4fbac1: Merge webkit.org at r51976 : GraphicsContext::setPlatformShadow now takes a ColorSpace argument.
Merge commit '
9d4fbac1fe10b33df5e73efeb171454603ac8cf3' into eclair-mr2-plus-aosp
* commit '
9d4fbac1fe10b33df5e73efeb171454603ac8cf3':
Merge webkit.org at r51976 : GraphicsContext::setPlatformShadow now takes a ColorSpace argument.
Steve Block [Thu, 17 Dec 2009 17:56:52 +0000 (09:56 -0800)]
am
02f7edff: Merge webkit.org at r51976 : ScriptValue::getString now takes a ScriptState parameter.
Merge commit '
02f7edff6c1625ed75eaf447e02ef659e62e3a10' into eclair-mr2-plus-aosp
* commit '
02f7edff6c1625ed75eaf447e02ef659e62e3a10':
Merge webkit.org at r51976 : ScriptValue::getString now takes a ScriptState parameter.
Steve Block [Thu, 17 Dec 2009 17:56:47 +0000 (09:56 -0800)]
am
81d7a8e2: Merge webkit.org at r51976 : Image::draw() and drawPattern() now take a ColorSpace.
Merge commit '
81d7a8e20f14dc502cc38f8d654adf1334a2833c' into eclair-mr2-plus-aosp
* commit '
81d7a8e20f14dc502cc38f8d654adf1334a2833c':
Merge webkit.org at r51976 : Image::draw() and drawPattern() now take a ColorSpace.
Steve Block [Thu, 17 Dec 2009 17:56:42 +0000 (09:56 -0800)]
am
888fd09c: Merge webkit.org at r51976 : V8Proxy::sourceName now returns bool.
Merge commit '
888fd09c906f3c3a24a303a859c4c5adc04643f4' into eclair-mr2-plus-aosp
* commit '
888fd09c906f3c3a24a303a859c4c5adc04643f4':
Merge webkit.org at r51976 : V8Proxy::sourceName now returns bool.
Steve Block [Thu, 17 Dec 2009 17:56:36 +0000 (09:56 -0800)]
am
2c3e1d02: Merge webkit.org at r51976 : externalRepresentation now takes a Frame argument.
Merge commit '
2c3e1d0284b92aad4ad3eba7505574bba9770080' into eclair-mr2-plus-aosp
* commit '
2c3e1d0284b92aad4ad3eba7505574bba9770080':
Merge webkit.org at r51976 : externalRepresentation now takes a Frame argument.
Steve Block [Thu, 17 Dec 2009 17:56:30 +0000 (09:56 -0800)]
am
f94c6846: Merge webkit.org at r51976 : A ColorSpace argument is now passed to GraphicsContext methods.
Merge commit '
f94c68461da450895b1f8dc388861cb764565bb5' into eclair-mr2-plus-aosp
* commit '
f94c68461da450895b1f8dc388861cb764565bb5':
Merge webkit.org at r51976 : A ColorSpace argument is now passed to GraphicsContext methods.
Steve Block [Thu, 17 Dec 2009 17:56:24 +0000 (09:56 -0800)]
am
0f41711d: Merge webkit.org at r51976 : Icon::createIconForFile has been removed.
Merge commit '
0f41711d127b039d940c02f98f2d48433880e8f7' into eclair-mr2-plus-aosp
* commit '
0f41711d127b039d940c02f98f2d48433880e8f7':
Merge webkit.org at r51976 : Icon::createIconForFile has been removed.
Steve Block [Thu, 17 Dec 2009 17:56:17 +0000 (09:56 -0800)]
am
4e46c2c1: Merge webkit.org at r51976 : Geolocation error code UNKNOWN_ERROR is deprecated.
Merge commit '
4e46c2c16f454c6652d32889814f25a5fbb3bf28' into eclair-mr2-plus-aosp
* commit '
4e46c2c16f454c6652d32889814f25a5fbb3bf28':
Merge webkit.org at r51976 : Geolocation error code UNKNOWN_ERROR is deprecated.
Steve Block [Thu, 17 Dec 2009 17:56:09 +0000 (09:56 -0800)]
am
6a011ab8: Merge webkit.org at r51976 : Implement new FrameLoaderClient page state methods.
Merge commit '
6a011ab807deb276b9924d501a4219542092958c' into eclair-mr2-plus-aosp
* commit '
6a011ab807deb276b9924d501a4219542092958c':
Merge webkit.org at r51976 : Implement new FrameLoaderClient page state methods.
Steve Block [Thu, 17 Dec 2009 17:56:02 +0000 (09:56 -0800)]
am
031c32d2: Merge webkit.org at r51976 : FrameLoaderClient::windowObjectCleared has been replaced with dispatchDidClearWindowObjectInWorld.
Merge commit '
031c32d25a37eec52b946918d7648750f8e59a1f' into eclair-mr2-plus-aosp
* commit '
031c32d25a37eec52b946918d7648750f8e59a1f':
Merge webkit.org at r51976 : FrameLoaderClient::windowObjectCleared has been replaced with dispatchDidClearWindowObjectInWorld.
Steve Block [Thu, 17 Dec 2009 17:55:54 +0000 (09:55 -0800)]
am
d5340bbd: Merge webkit.org at r51976 : Implement new ChromeClient::focusedNodeChanged method.
Merge commit '
d5340bbd847b3fabb04f28f1aa8425f1874b0bb3' into eclair-mr2-plus-aosp
* commit '
d5340bbd847b3fabb04f28f1aa8425f1874b0bb3':
Merge webkit.org at r51976 : Implement new ChromeClient::focusedNodeChanged method.
Steve Block [Thu, 17 Dec 2009 17:55:45 +0000 (09:55 -0800)]
am
c351226d: Merge webkit.org at r51976 : Changes to InspectorController.
Merge commit '
c351226de9a0ca9d369e44537f6c9ad6606bd219' into eclair-mr2-plus-aosp
* commit '
c351226de9a0ca9d369e44537f6c9ad6606bd219':
Merge webkit.org at r51976 : Changes to InspectorController.
Steve Block [Thu, 17 Dec 2009 17:55:36 +0000 (09:55 -0800)]
am
7857d371: Merge webkit.org at r51976 : Fix Makefiles.
Merge commit '
7857d3718de9ebd025de4cfd7c8b0e78af4ea21b' into eclair-mr2-plus-aosp
* commit '
7857d3718de9ebd025de4cfd7c8b0e78af4ea21b':
Merge webkit.org at r51976 : Fix Makefiles.
Steve Block [Thu, 17 Dec 2009 17:55:28 +0000 (09:55 -0800)]
am
aad6f24e: Merge webkit.org at r51976 : Fix general conflicts.
Merge commit '
aad6f24e036b3740071bb995b955b18b572067b2' into eclair-mr2-plus-aosp
* commit '
aad6f24e036b3740071bb995b955b18b572067b2':
Merge webkit.org at r51976 : Fix general conflicts.
Steve Block [Thu, 17 Dec 2009 17:55:18 +0000 (09:55 -0800)]
am
dc11ae82: Merge webkit.org at r51976 : Fix conflicts in Makefiles.
Merge commit '
dc11ae82374cba25ed19c3e57537cbc667f8efe2' into eclair-mr2-plus-aosp
* commit '
dc11ae82374cba25ed19c3e57537cbc667f8efe2':
Merge webkit.org at r51976 : Fix conflicts in Makefiles.
Steve Block [Thu, 17 Dec 2009 17:55:06 +0000 (09:55 -0800)]
am
643ca787: Merge webkit.org at r51976 : Initial merge by git.
Merge commit '
643ca7872b450ea4efacab6188849e5aac2ba161' into eclair-mr2-plus-aosp
* commit '
643ca7872b450ea4efacab6188849e5aac2ba161':
Merge webkit.org at r51976 : Initial merge by git.
Steve Block [Wed, 25 Nov 2009 18:46:40 +0000 (18:46 +0000)]
Merge webkit.org at r51976 : Update WebKit revision number.
Change-Id: I71ebb1ee90bbca9328a3c6ca30f0beaefebbede2
Steve Block [Thu, 26 Nov 2009 14:10:10 +0000 (14:10 +0000)]
Merge webkit.org at r51976 : ColorSpace type has been removed.
See the following WebKit changes ...
http://trac.webkit.org/changeset/50614
http://trac.webkit.org/changeset/51124
http://trac.webkit.org/changeset/51161
Change-Id: I690bb3aebc75b5a45396bb9bbcc4ee797ca3465b
Steve Block [Thu, 26 Nov 2009 16:08:52 +0000 (16:08 +0000)]
Merge webkit.org at r51976 : GraphicsContext::setPlatformShadow now takes a ColorSpace argument.
See http://trac.webkit.org/changeset/50852
Change-Id: Ie6ddbe8da1ce7bc2dffbd57bb93aee5d5e9a1068
Steve Block [Wed, 9 Dec 2009 16:48:47 +0000 (16:48 +0000)]
Merge webkit.org at r51976 : ScriptValue::getString now takes a ScriptState parameter.
See http://trac.webkit.org/changeset/51801
Change-Id: I819c17c8609dd65799bd8a2245cc454e27271969
Steve Block [Wed, 9 Dec 2009 15:40:02 +0000 (15:40 +0000)]
Merge webkit.org at r51976 : Image::draw() and drawPattern() now take a ColorSpace.
See http://trac.webkit.org/changeset/51212
Change-Id: I276253611ffe7518733fc7af51b0dfcc5f5d8691
Steve Block [Thu, 26 Nov 2009 21:00:59 +0000 (21:00 +0000)]
Merge webkit.org at r51976 : V8Proxy::sourceName now returns bool.
See http://trac.webkit.org/changeset/50327
Change-Id: If8461f4f433a8addac9cd593f5f66571399a31bb
Steve Block [Wed, 9 Dec 2009 15:19:26 +0000 (15:19 +0000)]
Merge webkit.org at r51976 : externalRepresentation now takes a Frame argument.
See http://trac.webkit.org/changeset/50923
Change-Id: I8c7bb8af6e40fd449e27f28ff0d2e58fbb4d9eb3
Steve Block [Thu, 26 Nov 2009 14:21:22 +0000 (14:21 +0000)]
Merge webkit.org at r51976 : A ColorSpace argument is now passed to GraphicsContext methods.
See http://trac.webkit.org/changeset/50760
Change-Id: I50c0864b1347e81839b8276a832311d7d1281148
Steve Block [Thu, 26 Nov 2009 13:10:36 +0000 (13:10 +0000)]
Merge webkit.org at r51976 : Icon::createIconForFile has been removed.
See http://trac.webkit.org/changeset/50632
Change-Id: I3b10aff021d89b66d4d3d5f52773e4922654fbfa
Steve Block [Wed, 9 Dec 2009 15:16:27 +0000 (15:16 +0000)]
Merge webkit.org at r51976 : Geolocation error code UNKNOWN_ERROR is deprecated.
See http://trac.webkit.org/changeset/50605
Change-Id: Iaad2055f169f56b7d43e2e3195041f0796506092
Steve Block [Wed, 9 Dec 2009 15:01:27 +0000 (15:01 +0000)]
Merge webkit.org at r51976 : Implement new FrameLoaderClient page state methods.
See http://trac.webkit.org/changeset/51644
Change-Id: I539af311723c20648d4958c46ee3ebe502e680b8
Steve Block [Wed, 9 Dec 2009 14:47:50 +0000 (14:47 +0000)]
Merge webkit.org at r51976 : FrameLoaderClient::windowObjectCleared has been replaced with dispatchDidClearWindowObjectInWorld.
See http://trac.webkit.org/changeset/50973
Change-Id: I54093cd917f15a51412b07b5495f32502cfd23b5
Steve Block [Wed, 9 Dec 2009 14:40:12 +0000 (14:40 +0000)]
Merge webkit.org at r51976 : Implement new ChromeClient::focusedNodeChanged method.
See http://trac.webkit.org/changeset/50351
Change-Id: Ia3fa68ebb7f54b3a88635c9e8ebade0180a62e21
Steve Block [Wed, 9 Dec 2009 14:36:06 +0000 (14:36 +0000)]
Merge webkit.org at r51976 : Changes to InspectorController.
See http://trac.webkit.org/changeset/51631
Change-Id: Ic0973105e04df1023d4df6f6e1d20052e869ac4a
Steve Block [Thu, 26 Nov 2009 12:12:20 +0000 (12:12 +0000)]
Merge webkit.org at r51976 : Fix Makefiles.
Change-Id: I7d9d5788efda1d0e985242ab03c8016069798acd
Steve Block [Tue, 15 Dec 2009 11:15:20 +0000 (11:15 +0000)]
Merge webkit.org at r51976 : Fix general conflicts.
Notes ...
For FrameLoader.cpp/h, see http://trac.webkit.org/changeset/51644
For FrameView.cpp and ScrolView.cpp, see http://trac.webkit.org/changeset/51636
For PluginInfoStore.cpp, see http://trac.webkit.org/changeset/51257
For Geolocation.cpp, see http://trac.webkit.org/changeset/50605
For V8DOMWrapper.cpp, see http://trac.webkit.org/changeset/51004
For V8Proxy.cpp, see http://trac.webkit.org/changeset/50441, http://trac.webkit.org/changeset/50327, http://trac.webkit.org/changeset/50406 and http://trac.webkit.org/changeset/50523
For HTMLInputElement.cpp, see http://trac.webkit.org/changeset/50996
For RenderBlock.cpp/RenderInline.cpp, see https://android-git.corp.google.com/g/#change,33465
Android-specific change to now-deleted JSCanvasArrayCustom.cpp was trivial.
Change-Id: Iddc8d43bdcb6208d6a991a7a1d591e8a4f918bf7
Steve Block [Tue, 15 Dec 2009 11:09:43 +0000 (11:09 +0000)]
Merge webkit.org at r51976 : Fix conflicts in Makefiles.
Android Makefiles were upstreamed in http://trac.webkit.org/changeset/51858
and http://trac.webkit.org/changeset/51926
Change-Id: I00f30d4894c1c5064fb7bd9be27317c039dbb0ad
Steve Block [Tue, 15 Dec 2009 10:12:09 +0000 (10:12 +0000)]
Merge webkit.org at r51976 : Initial merge by git.
Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
Mike Reed [Thu, 17 Dec 2009 16:23:58 +0000 (08:23 -0800)]
am
d026980f: register the eventinterface with our dispatcher list
Merge commit '
d026980fde6eb3b01c1fe49441174e89cd1be298' into eclair-mr2-plus-aosp
* commit '
d026980fde6eb3b01c1fe49441174e89cd1be298':
register the eventinterface with our dispatcher list