OSDN Git Service
Andrei Popescu [Fri, 8 Jan 2010 16:55:35 +0000 (16:55 +0000)]
Fix a code ugliness issue: avoid using two variables named "size" inside the same for loop.
Andrei Popescu [Wed, 23 Dec 2009 13:07:26 +0000 (13:07 +0000)]
Update WebCore/platform/network with changes upstreamed in
https://bugs.webkit.org/show_bug.cgi?id=32871
https://bugs.webkit.org/show_bug.cgi?id=32873
This will be submitted once the above changes land upstream.
Leon Scroggins [Thu, 7 Jan 2010 20:45:32 +0000 (12:45 -0800)]
am
e44f974f: am
15f1e443: In motionUp, update the CachedHistory\'s mMouseBounds.
Merge commit '
e44f974f1d7e25a2823901e0f34c04aa924b7527'
* commit '
e44f974f1d7e25a2823901e0f34c04aa924b7527':
In motionUp, update the CachedHistory's mMouseBounds.
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:32:55 +0000 (10:32 -0800)]
am
6864ec3c: am
1ccac4c1: remove unused jni interfaces
Merge commit '
6864ec3c0bb8b5cc0dfa126546419113e946661a'
* commit '
6864ec3c0bb8b5cc0dfa126546419113e946661a':
remove unused jni interfaces
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
Steve Block [Thu, 7 Jan 2010 13:02:14 +0000 (13:02 +0000)]
Reverts Android-specific change to avoid adding history items for fragment scrolls initiated by script.
Bug:
2360542
Change-Id: I4a60840dfb89753b4f56f96b5017269bfcf99392
Leon Scroggins [Thu, 7 Jan 2010 14:24:49 +0000 (06:24 -0800)]
Merge "resolved conflicts for merge of
174cd118 to master"
Leon Scroggins [Thu, 7 Jan 2010 14:15:28 +0000 (09:15 -0500)]
resolved conflicts for merge of
174cd118 to master
Steve Block [Thu, 7 Jan 2010 14:10:05 +0000 (06:10 -0800)]
Merge "Updates Document::setExtraLayoutDelay to reflect recent submission to webkit.org."
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.
Steve Block [Tue, 22 Dec 2009 20:09:45 +0000 (20:09 +0000)]
Updates Document::setExtraLayoutDelay to reflect recent submission to webkit.org.
setExtraLayoutDelay was an Android addition and was upstreamed to webkit.org in
https://bugs.webkit.org/show_bug.cgi?id=32875
Removes Document::extraLayoutDelay by incorporating the extra delay in Document::minimumLayoutDelay.
Removes ANDROID_MOBILE guards, as this extra code is not inhernetly specific to Android, and is a
no-op if Document::setExtraLayoutDelay is not called. This removes the last uses of ANDROID_MOBILE.
Change-Id: I1e18a994f32b29558dcf9a5c76aefab62e9fc13d
Shimeng (Simon) Wang [Thu, 7 Jan 2010 00:27:25 +0000 (16:27 -0800)]
Disable "fit to screen" if line height < font size.
Bug:
2289376
modified: WebCore/rendering/RenderBlockLineLayout.cpp
Leon Scroggins [Wed, 6 Jan 2010 22:08:14 +0000 (14:08 -0800)]
am
f0c18f75: am
e5e9720d: In findBestHitAt, set x and y to the intersection of slop and cursor.
Merge commit '
f0c18f75640006d930c0b2ea95422c3fdafedfdc'
* commit '
f0c18f75640006d930c0b2ea95422c3fdafedfdc':
In findBestHitAt, set x and y to the intersection of slop and cursor.
Leon Scroggins [Wed, 6 Jan 2010 22:08:04 +0000 (14:08 -0800)]
am
3146e9ee: am
62d9c8e5: Store label information to be used for hint text.
Merge commit '
3146e9ee4d8f6114a97ceb01d6fd54db77d99538'
* commit '
3146e9ee4d8f6114a97ceb01d6fd54db77d99538':
Store label information to be used for hint text.
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.
Cary Clark [Tue, 5 Jan 2010 15:54:22 +0000 (07:54 -0800)]
Merge "extract selected text from the picture"
Cary Clark [Wed, 23 Dec 2009 18:22:37 +0000 (13:22 -0500)]
extract selected text from the picture
The deleted code extracted the selected text from the WebKit DOM
by looking for text in the render tree that matched the selection
region. This has never worked well.
The replacement approach matches the glyphs in the picture instead.
- WebViewCore.*
Remove getSelection() and supporting routines. Part of the deleted
code looked for punctuation between segments to add space characters
that might not be present in the markup. There's no equivalent in
the replacement code; it uses spacial gaps to detect the need to
add extra spaces.
- SelectText.*
Match the text to the selected region and convert the glyph to
unicode. The tricky part is that spaces need to be inserted into
the string when there are gaps in the text.
- WebView.cpp
Return the selection as a string to the java caller instead
of a region.
To convert the glyphs into text, a companion change was made to
external/skia. To update the UI thread/webkit thread messaging, a
companion change was also made to frameworks/base.
Fixes http://b/
2166748
Steve Block [Thu, 17 Dec 2009 13:32:53 +0000 (13:32 +0000)]
Defines PLATFORM(SKIA), instead of PLATFROM(SGL) for Android.
Skia is used by Chromium, which defines PLATFORM(SKIA).
Android also uses Skia, but currently defines PLATFORM(SGL) to account for
platform-specific differences between Android and Chromum.
We now use PLATFORM(SKIA) on Android and remove PLATFORM(SGL).
Platform-specific differences are achieved with PLATFORM(ANDROID) guards.
This reduces our diff with webkit.org.
Change-Id: Ibf920b1929e7c3cdabb025ae61ceae3df67258bb
Nicolas Roard [Mon, 4 Jan 2010 23:40:02 +0000 (15:40 -0800)]
am
3703e41d: am
3bacb88b: Revert to ENABLE_ORIENTATION_EVENTS=1
Merge commit '
3703e41d68a5747ef178cd5fc4361ee7c9e38249'
* commit '
3703e41d68a5747ef178cd5fc4361ee7c9e38249':
Revert to ENABLE_ORIENTATION_EVENTS=1
android-build SharedAccount [Mon, 4 Jan 2010 23:38:02 +0000 (15:38 -0800)]
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 20:25:48 +0000 (20:25 +0000)]
resolved conflicts for merge of
870689c8
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:57:37 +0000 (10:57 -0500)]
resolved conflicts for merge of
66367cf8 to master
Steve Block [Mon, 4 Jan 2010 15:43:50 +0000 (07:43 -0800)]
am
dcfdcbd8: am
edb4aa51: Merge "Cherry-picks a WebKit change to revert recent changes to String addition for JSC." into eclair-mr2
Merge commit '
dcfdcbd80716c1ccc3ff3d122c96d36b09c46a60'
* commit '
dcfdcbd80716c1ccc3ff3d122c96d36b09c46a60':
Cherry-picks a WebKit change to revert recent changes to String addition for JSC.
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 [Mon, 4 Jan 2010 13:04:38 +0000 (05:04 -0800)]
Merge "Move STLPort to external/stlport."
Steve Block [Wed, 30 Dec 2009 10:42:42 +0000 (02:42 -0800)]
Merge "Android special-casing when using std::sort is no longer needed now that we use STLPort."
Android (Google) Code Review [Tue, 22 Dec 2009 23:38:33 +0000 (15:38 -0800)]
Merge change Ic58f0270
* changes:
Fixes MainThreadAndroid to use AndroidThreading, rather than calling methods on JavaSharedClient directly.
Steve Block [Tue, 22 Dec 2009 16:28:44 +0000 (16:28 +0000)]
Move STLPort to external/stlport.
Change-Id: I9cea43f9e1f98cefa654c5661dc7faa7f939068d
Steve Block [Tue, 22 Dec 2009 16:09:29 +0000 (16:09 +0000)]
Android special-casing when using std::sort is no longer needed now that we use STLPort.
Change-Id: I9ca01b71637457f9e84384f5dd748f141c13c3b0
Android (Google) Code Review [Mon, 21 Dec 2009 16:57:52 +0000 (08:57 -0800)]
Merge change I8457f5dc
* changes:
Update the cookie code in platform/network to match the code upstreamed in
Steve Block [Sat, 19 Dec 2009 20:20:17 +0000 (20:20 +0000)]
Fixes MainThreadAndroid to use AndroidThreading, rather than calling methods on JavaSharedClient directly.
AndroidThreading is defined in WTF and implemented in WebKit. This is the
pattern used by Chromium, and avoids the current layering violation due to WTF
calling into WebKit.
This is being upstreamed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=32651
Change-Id: Ic58f0270ed134d9f897075cca692718d1c2e9369
Andrei Popescu [Thu, 17 Dec 2009 13:31:38 +0000 (13:31 +0000)]
Update the cookie code in platform/network to match
the code upstreamed in
https://bugs.webkit.org/show_bug.cgi?id=32559
Derek Sollenberger [Fri, 18 Dec 2009 17:49:05 +0000 (09:49 -0800)]
am
3cc6d801: am
626f2058: Merge change Iab49f046 into eclair-mr2
Merge commit '
3cc6d80119d793fd256083020b992f1ab02d4a8b'
* commit '
3cc6d80119d793fd256083020b992f1ab02d4a8b':
Fix to ensure plugin is notified even when the screen width does not change.
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 15:05:48 +0000 (15:05 +0000)]
resolved conflicts for merge of
a0fb8e99 to master
Change-Id: I58d6bb71dc7c4f5962c73669555a217c1d94b690
Android (Google) Code Review [Fri, 18 Dec 2009 14:46:44 +0000 (06:46 -0800)]
Merge change Ife24867a
* changes:
Updates use of pow() in HTMLInputElement::stepMismatch() to match version upstreamed to webkit.org.
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:20:47 +0000 (02:20 -0800)]
am
5c8706a2: am
6c4eb7eb: Merge change I49687314 into eclair-mr2
Merge commit '
5c8706a25612076fca97032bce1ba627f6ba618b'
* commit '
5c8706a25612076fca97032bce1ba627f6ba618b':
Fixes a Geolocation bug with cached positions.
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.
Android (Google) Code Review [Fri, 18 Dec 2009 10:10:01 +0000 (02:10 -0800)]
Merge change I5c386924
* changes:
Fixes compiler warnings in JavaSharedClient.cpp.
Steve Block [Thu, 17 Dec 2009 19:34:42 +0000 (19:34 +0000)]
Updates use of pow() in HTMLInputElement::stepMismatch() to match version upstreamed to webkit.org.
See https://bugs.webkit.org/show_bug.cgi?id=32675
Change-Id: Ife24867a1c96a3b46226d06862198a2e6dfeb216
Grace Kloba [Thu, 17 Dec 2009 01:47:13 +0000 (17:47 -0800)]
Clean up. Use native weak references.
This is due to the changes were made in mr2 branch
which used the old way.
Steve Block [Thu, 17 Dec 2009 13:39:33 +0000 (13:39 +0000)]
Fixes compiler warnings in JavaSharedClient.cpp.
Change-Id: I5c386924243ef98392b9c67c907421d714273e26
Steve Block [Thu, 17 Dec 2009 18:48:37 +0000 (18:48 +0000)]
Fixes the build break in master.
The new WebKit merge caused a build break when auto-merged from eclair-mr2 to
master, due to the fact that master uses stl_port.
Change-Id: I1437352a3439f3e103572ed3e1bb523ec65e98ef
Steve Block [Thu, 17 Dec 2009 18:20:49 +0000 (10:20 -0800)]
am
2427cd61: am
2fb528f4: Adds notes to upstream feature guards added in V8DOMWrapper.cpp.
Merge commit '
2427cd61fec29b72e27eb037ca0c6c57cb4ad66c'
* commit '
2427cd61fec29b72e27eb037ca0c6c57cb4ad66c':
Adds notes to upstream feature guards added in V8DOMWrapper.cpp.
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 [Thu, 17 Dec 2009 18:02:58 +0000 (10:02 -0800)]
am
59ae5ddb: am
7a747c0b: Merge webkit.org at r51976 : Update WebKit revision number.
Merge commit '
59ae5ddbde249184d70f52fcb042e22249013b49'
* commit '
59ae5ddbde249184d70f52fcb042e22249013b49':
Merge webkit.org at r51976 : Update WebKit revision number.
Steve Block [Thu, 17 Dec 2009 18:02:53 +0000 (10:02 -0800)]
am
29e5c5be: am
dda7a494: Merge webkit.org at r51976 : ColorSpace type has been removed.
Merge commit '
29e5c5be5df3ce4aa71be53c305a3865ac176bd7'
* commit '
29e5c5be5df3ce4aa71be53c305a3865ac176bd7':
Merge webkit.org at r51976 : ColorSpace type has been removed.
Steve Block [Thu, 17 Dec 2009 18:02:49 +0000 (10:02 -0800)]
am
414d056a: am
9d4fbac1: Merge webkit.org at r51976 : GraphicsContext::setPlatformShadow now takes a ColorSpace argument.
Merge commit '
414d056a7b20a9f5ff2c5b38865dd8a7dfbcb572'
* commit '
414d056a7b20a9f5ff2c5b38865dd8a7dfbcb572':
Merge webkit.org at r51976 : GraphicsContext::setPlatformShadow now takes a ColorSpace argument.
Steve Block [Thu, 17 Dec 2009 18:02:44 +0000 (10:02 -0800)]
am
f0765cd6: am
02f7edff: Merge webkit.org at r51976 : ScriptValue::getString now takes a ScriptState parameter.
Merge commit '
f0765cd6cf9455ac0793d1a30287f4a57bc4871e'
* commit '
f0765cd6cf9455ac0793d1a30287f4a57bc4871e':
Merge webkit.org at r51976 : ScriptValue::getString now takes a ScriptState parameter.
Steve Block [Thu, 17 Dec 2009 18:02:39 +0000 (10:02 -0800)]
am
0c57ad20: am
81d7a8e2: Merge webkit.org at r51976 : Image::draw() and drawPattern() now take a ColorSpace.
Merge commit '
0c57ad202e278da5dd5bbaae7200038f1c32f6a9'
* commit '
0c57ad202e278da5dd5bbaae7200038f1c32f6a9':
Merge webkit.org at r51976 : Image::draw() and drawPattern() now take a ColorSpace.
Steve Block [Thu, 17 Dec 2009 18:02:33 +0000 (10:02 -0800)]
am
70c282a8: am
888fd09c: Merge webkit.org at r51976 : V8Proxy::sourceName now returns bool.
Merge commit '
70c282a8607c1ea618bfe9136ffcb4b6dc4b833f'
* commit '
70c282a8607c1ea618bfe9136ffcb4b6dc4b833f':
Merge webkit.org at r51976 : V8Proxy::sourceName now returns bool.
Steve Block [Thu, 17 Dec 2009 18:02:27 +0000 (10:02 -0800)]
am
ba6d5d3a: am
2c3e1d02: Merge webkit.org at r51976 : externalRepresentation now takes a Frame argument.
Merge commit '
ba6d5d3abff2997e37db0d6ec70d9f2e7717ac2f'
* commit '
ba6d5d3abff2997e37db0d6ec70d9f2e7717ac2f':
Merge webkit.org at r51976 : externalRepresentation now takes a Frame argument.
Steve Block [Thu, 17 Dec 2009 18:02:21 +0000 (10:02 -0800)]
am
6af60126: am
f94c6846: Merge webkit.org at r51976 : A ColorSpace argument is now passed to GraphicsContext methods.
Merge commit '
6af60126e4aa9b3eaee94303194fa6b92f3f469e'
* commit '
6af60126e4aa9b3eaee94303194fa6b92f3f469e':
Merge webkit.org at r51976 : A ColorSpace argument is now passed to GraphicsContext methods.
Steve Block [Thu, 17 Dec 2009 18:02:13 +0000 (10:02 -0800)]
am
eb2b5623: am
0f41711d: Merge webkit.org at r51976 : Icon::createIconForFile has been removed.
Merge commit '
eb2b5623e71ea3dd0133246a2ede5741faa94137'
* commit '
eb2b5623e71ea3dd0133246a2ede5741faa94137':
Merge webkit.org at r51976 : Icon::createIconForFile has been removed.
Steve Block [Thu, 17 Dec 2009 18:02:06 +0000 (10:02 -0800)]
am
9c0e72f5: am
4e46c2c1: Merge webkit.org at r51976 : Geolocation error code UNKNOWN_ERROR is deprecated.
Merge commit '
9c0e72f596f1f533e13884a801a5b8b4adba81aa'
* commit '
9c0e72f596f1f533e13884a801a5b8b4adba81aa':
Merge webkit.org at r51976 : Geolocation error code UNKNOWN_ERROR is deprecated.
Steve Block [Thu, 17 Dec 2009 18:01:59 +0000 (10:01 -0800)]
am
5f4e2a53: am
6a011ab8: Merge webkit.org at r51976 : Implement new FrameLoaderClient page state methods.
Merge commit '
5f4e2a5339867f6221d9972a2c89da542b03df91'
* commit '
5f4e2a5339867f6221d9972a2c89da542b03df91':
Merge webkit.org at r51976 : Implement new FrameLoaderClient page state methods.
Steve Block [Thu, 17 Dec 2009 18:01:51 +0000 (10:01 -0800)]
am
5a1b2372: am
031c32d2: Merge webkit.org at r51976 : FrameLoaderClient::windowObjectCleared has been replaced with dispatchDidClearWindowObjectInWorld.
Merge commit '
5a1b2372e2f6567de9dac340f3783e33dff9a35c'
* commit '
5a1b2372e2f6567de9dac340f3783e33dff9a35c':
Merge webkit.org at r51976 : FrameLoaderClient::windowObjectCleared has been replaced with dispatchDidClearWindowObjectInWorld.
Steve Block [Thu, 17 Dec 2009 18:01:42 +0000 (10:01 -0800)]
am
74a4e2a1: am
d5340bbd: Merge webkit.org at r51976 : Implement new ChromeClient::focusedNodeChanged method.
Merge commit '
74a4e2a1a7c59f4db044c2541919e05e7d04b2b5'
* commit '
74a4e2a1a7c59f4db044c2541919e05e7d04b2b5':
Merge webkit.org at r51976 : Implement new ChromeClient::focusedNodeChanged method.
Steve Block [Thu, 17 Dec 2009 18:01:33 +0000 (10:01 -0800)]
am
1e7237f8: am
c351226d: Merge webkit.org at r51976 : Changes to InspectorController.
Merge commit '
1e7237f82ba36a49bb7938c0552d6cf1ad56c3ad'
* commit '
1e7237f82ba36a49bb7938c0552d6cf1ad56c3ad':
Merge webkit.org at r51976 : Changes to InspectorController.
Steve Block [Thu, 17 Dec 2009 18:01:25 +0000 (10:01 -0800)]
am
5a65d16f: am
7857d371: Merge webkit.org at r51976 : Fix Makefiles.
Merge commit '
5a65d16fcdf03f348b244f753f7242a36c0cf7fb'
* commit '
5a65d16fcdf03f348b244f753f7242a36c0cf7fb':
Merge webkit.org at r51976 : Fix Makefiles.
Steve Block [Thu, 17 Dec 2009 18:01:16 +0000 (10:01 -0800)]
am
4dd98cc2: am
aad6f24e: Merge webkit.org at r51976 : Fix general conflicts.
Merge commit '
4dd98cc27e25e6c3104672f50749132d2236461b'
* commit '
4dd98cc27e25e6c3104672f50749132d2236461b':
Merge webkit.org at r51976 : Fix general conflicts.
Steve Block [Thu, 17 Dec 2009 18:01:02 +0000 (10:01 -0800)]
am
fadf964d: am
dc11ae82: Merge webkit.org at r51976 : Fix conflicts in Makefiles.
Merge commit '
fadf964da75468c2c995316cea8d82d32705a7e1'
* commit '
fadf964da75468c2c995316cea8d82d32705a7e1':
Merge webkit.org at r51976 : Fix conflicts in Makefiles.
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 18:00:51 +0000 (10:00 -0800)]
am
b880d713: am
643ca787: Merge webkit.org at r51976 : Initial merge by git.
Merge commit '
b880d713c04257ca40abfef97c300afdead423b8'
* commit '
b880d713c04257ca40abfef97c300afdead423b8':
Merge webkit.org at r51976 : Initial merge by git.
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.