OSDN Git Service
Grace Kloba [Tue, 19 Jan 2010 08:34:36 +0000 (00:34 -0800)]
am
1a318d00: am
336f436c: Don\'t call setNPWindowRect unless the plugin has started. Otherwise the plugin won\'t get the rect later as it thinks it is not changed.
Merge commit '
1a318d002f30c34f2a43bbd33897398ea2966f9c'
* commit '
1a318d002f30c34f2a43bbd33897398ea2966f9c':
Don't call setNPWindowRect unless the plugin has
Grace Kloba [Tue, 19 Jan 2010 08:17:20 +0000 (00:17 -0800)]
am
336f436c: Don\'t call setNPWindowRect unless the plugin has started. Otherwise the plugin won\'t get the rect later as it thinks it is not changed.
Merge commit '
336f436ca1f1b868aeabd408e8dbb5d1e893d701' into eclair-mr2-plus-aosp
* commit '
336f436ca1f1b868aeabd408e8dbb5d1e893d701':
Don't call setNPWindowRect unless the plugin has
Grace Kloba [Tue, 19 Jan 2010 08:02:32 +0000 (00:02 -0800)]
Grace Kloba [Mon, 18 Jan 2010 22:12:37 +0000 (14:12 -0800)]
Don't call setNPWindowRect unless the plugin has
started. Otherwise the plugin won't get the rect
later as it thinks it is not changed.
Steve Block [Thu, 14 Jan 2010 15:45:16 +0000 (15:45 +0000)]
Cherry-pick WebKit change 52103 - Add a client based Geolocation provider
This is required to ease the process of upstreaming the Geolocation maximumAge handling code.
Note that changes to WebCoreFrameBridge.cpp and WebCoreJniOnLoad.cpp were required as a result of this.
Change-Id: Icd8524da9050acda3b991051877c3b5cf262b2b3
Andrei Popescu [Thu, 14 Jan 2010 19:19:31 +0000 (19:19 +0000)]
Add navigator.networkType to allow apps to detect the connection type.
The online event is fired when the networkType changes.
Bug:
2368650
Steve Block [Fri, 15 Jan 2010 16:58:33 +0000 (08:58 -0800)]
Merge "Removes a superfluous call to GeoNotifier::m_timer::stop() when Geolocation calls back with a position fix."
Steve Block [Fri, 15 Jan 2010 16:03:39 +0000 (16:03 +0000)]
Removes a superfluous call to GeoNotifier::m_timer::stop() when Geolocation calls back with a position fix.
This call was removed in https://android-git.corp.google.com/g/#change,21293
but inadvertantly added back in https://android-git.corp.google.com/g/#change,21677 See https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=
e0330ac957b8434cd2c9c7b5447aaa0faabe77ec
This call is not present in webkit.org.
Change-Id: I712b5d29871e8bda54340e510c2bd7bc411728ee
Nicolas Roard [Fri, 15 Jan 2010 15:31:14 +0000 (15:31 +0000)]
Fix for setting layers opacity through CSS (bug b/
2376455)
Leon Clarke [Fri, 15 Jan 2010 12:04:35 +0000 (04:04 -0800)]
Merge "Check for the absence of a frame. This crashes in the situation where the XHR responseXML method is being called on a document with meta tags. b/issue?id=
2346028"
Grace Kloba [Fri, 15 Jan 2010 02:25:41 +0000 (18:25 -0800)]
am
8a2903f5: am
b8a54826: Don\'t use static jclass unless we hold a reference.
Merge commit '
8a2903f5d11d14c8cb827d22a0a877a6e3507906'
* commit '
8a2903f5d11d14c8cb827d22a0a877a6e3507906':
Don't use static jclass unless we hold a reference.
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:18:44 +0000 (13:18 -0800)]
am
93f808ab: am
388e461f: Add proper support for fixed position elements
Merge commit '
93f808abccaf6f09c5c0226c01942c3be445031a'
* commit '
93f808abccaf6f09c5c0226c01942c3be445031a':
Add proper support for fixed position elements
Nicolas Roard [Thu, 14 Jan 2010 21:15:17 +0000 (13:15 -0800)]
am
459f6c34: am
29b325cb: Fix \'disappearing layers\' bug (see b/
2371053)
Merge commit '
459f6c347256a4d9fe815793302130fe06bd8f83'
* commit '
459f6c347256a4d9fe815793302130fe06bd8f83':
Fix 'disappearing layers' bug (see http://b/
2371053)
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)
Leon Clarke [Thu, 14 Jan 2010 16:39:36 +0000 (16:39 +0000)]
Check for the absence of a frame.
This crashes in the situation where the XHR responseXML method is being
called on a document with meta tags.
http://b/issue?id=
2346028
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 13:12:13 +0000 (05:12 -0800)]
am
594a3479: am
44364d80: Merge "Update jni_runtime.cpp with the latest changes to appendClassName." into eclair-mr2
Merge commit '
594a347941318556ae40d521e6f5c23fd9cf66b4'
* commit '
594a347941318556ae40d521e6f5c23fd9cf66b4':
Update jni_runtime.cpp with the latest changes to appendClassName.
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 12:25:49 +0000 (12:25 +0000)]
resolved conflicts for merge of
a08c8a5f to master
Change-Id: I8efc2ef2e8e51d823b7ec8c26bd90ce934f60900
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
Grace Kloba [Thu, 14 Jan 2010 03:19:47 +0000 (19:19 -0800)]
Grace Kloba [Thu, 14 Jan 2010 02:07:24 +0000 (18:07 -0800)]
DO NOT MERGE.
If the old screen width is 0, don't bother find the
node to realign the page.
This shaves off 1/2 of the increased time in the
page_cycler due to the new pinch changes.
e.g. with moz suite.
It was 201422 ms
After pinch changes, it is 218531 ms
After this change, it is 207367 ms
Fix http://b/issue?id=
2371694
Patrick Scott [Wed, 13 Jan 2010 19:51:46 +0000 (11:51 -0800)]
am
e4771f1b: am
6916255e: Call into MimeTypeMap to get the mime type for an extension.
Merge commit '
e4771f1b95589eff8479702dfbf5ef03c267c5c3'
* commit '
e4771f1b95589eff8479702dfbf5ef03c267c5c3':
Call into MimeTypeMap to get the mime type for an extension.
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
Cary Clark [Wed, 13 Jan 2010 13:30:03 +0000 (08:30 -0500)]
clip the cursor rings if occluded
Also, if a smaller object, like text, is drawn over a occluding rectangle,
ignore it, and don't reset the occluded state.
fixes http://b/
2319610
Grace Kloba [Wed, 13 Jan 2010 05:33:43 +0000 (21:33 -0800)]
Grace Kloba [Wed, 13 Jan 2010 01:14:42 +0000 (17:14 -0800)]
DO NOT MERGE.
Check the dimensions against 0 before using it to
calculate the ratio.
Fix http://b/issue?id=
2368862
Grace Kloba [Wed, 13 Jan 2010 02:34:31 +0000 (18:34 -0800)]
Leon Scroggins [Tue, 12 Jan 2010 22:24:15 +0000 (14:24 -0800)]
am
ddd2f469: am
ab9c9800: Merge "Compare Node pointers rather than CachedNode pointers." into eclair-mr2
Merge commit '
ddd2f469835ed5402cb3edfa6c2865536011fbab'
* commit '
ddd2f469835ed5402cb3edfa6c2865536011fbab':
Compare Node pointers rather than CachedNode pointers.
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
Steve Block [Tue, 12 Jan 2010 21:10:51 +0000 (13:10 -0800)]
Merge "resolved conflicts for merge of
e0286f66 to master"
Steve Block [Tue, 12 Jan 2010 20:30:31 +0000 (20:30 +0000)]
resolved conflicts for merge of
e0286f66 to master
Change-Id: I6efcacf082170506048d0a2caf3d669796fc4253
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:31:34 +0000 (12:31 -0800)]
am
8752c4d3: am
f8ffa7ae: Merge "adding event to notify the plugin when it is on/off screen." into eclair-mr2
Merge commit '
8752c4d3c7d623f1f6314e8b662d3626c849ca97'
* commit '
8752c4d3c7d623f1f6314e8b662d3626c849ca97':
adding event to notify the plugin when it is on/off screen.
Leon Scroggins [Tue, 12 Jan 2010 20:31:29 +0000 (12:31 -0800)]
am
4843cf01: am
9fb6b3c3: Ensure that the current textfield is actually a textfield before treating it like one.
Merge commit '
4843cf010e538098e485802576b5a16d7f5cb5f1'
* commit '
4843cf010e538098e485802576b5a16d7f5cb5f1':
Ensure that the current textfield is actually a textfield before treating it like one.
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
Steve Block [Tue, 12 Jan 2010 20:10:46 +0000 (12:10 -0800)]
am
8ed98e2e: When starting the Geolocation service provider, check that the WebView is not already paused.
Merge commit '
8ed98e2e3f77020f7a43bbd5427bc3dd12ba5743' into eclair-plus-aosp
* commit '
8ed98e2e3f77020f7a43bbd5427bc3dd12ba5743':
When starting the Geolocation service provider, check that the WebView is not already paused.
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.
Andrei Popescu [Tue, 12 Jan 2010 16:17:31 +0000 (08:17 -0800)]
Merge "Implement timeupdate events for video tag."
Ben Murdoch [Tue, 12 Jan 2010 15:15:57 +0000 (07:15 -0800)]
Merge "Cherry pick from Webkit for fix for https://bugs.webkit.org/show_bug.cgi?id=31539."
Cary Clark [Mon, 11 Jan 2010 19:55:20 +0000 (14:55 -0500)]
rebuild the nav cache if the clicked on node is invalid
Before, the slop parameter was set to zero if the node was
invalid, and used to skip searching for the node. Now, the
cache is rebuilt on the java side before the C side is
called.
requires a companion fix in frameworks/base
fixes http://b/
2362334
Andrei Popescu [Mon, 11 Jan 2010 21:11:21 +0000 (21:11 +0000)]
Implement timeupdate events for video tag.
Fix http://b/issue?id=
2210105
Ben Murdoch [Tue, 12 Jan 2010 12:00:51 +0000 (12:00 +0000)]
Cherry pick from Webkit for fix for https://bugs.webkit.org/show_bug.cgi?id=31539.
Restore the default state of a textarea correctly.
Change-Id: Id182817b7cd229e12676fd5ef55657ff6a963a4f
Steve Block [Tue, 12 Jan 2010 00:18:58 +0000 (00:18 +0000)]
When starting the Geolocation service provider, check that the WebView is not already paused.
This fixes the following scenario ...
- The browser back stack contains a page which calls Geolocation::watchPosition form its onload handler.
- User presses the back button quickly and repeatedly until the browser goes to the background.
- The browser calls WebViewCore::Pause when it goes into the background, which suspends any Geolocation
services in use. However, this call is made before the page which calls Geolocation::watchPosition has
been loaded. WebKit later loads this page, which creates a new Geolocation object which is never paused.
With this fix, the new Geolocation object is not started when it is first created. It does nothing until
it is resumed when the Browser is brought back to the foreground.
Bug:
2363338
Derek Sollenberger [Mon, 11 Jan 2010 21:58:49 +0000 (13:58 -0800)]
Merge "resolved conflicts for merge of
ab89d1aa to master"
Derek Sollenberger [Mon, 11 Jan 2010 21:54:05 +0000 (16:54 -0500)]
resolved conflicts for merge of
ab89d1aa to master
Grace Kloba [Mon, 11 Jan 2010 21:50:35 +0000 (13:50 -0800)]
am
4ad9c9b7: (-s ours) am
237bd75b: First draft of multitouch in the WebView.
Merge commit '
4ad9c9b76f04defb3c0be94db5cf672322f53104'
* commit '
4ad9c9b76f04defb3c0be94db5cf672322f53104':
First draft of multitouch in the WebView.
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.
Grace Kloba [Mon, 11 Jan 2010 18:47:30 +0000 (10:47 -0800)]
am
237bd75b: First draft of multitouch in the WebView.
Merge commit '
237bd75b6ebc1298cbd1c46b43903d19d7dd18b1' into eclair-plus-aosp
* commit '
237bd75b6ebc1298cbd1c46b43903d19d7dd18b1':
First draft of multitouch in the WebView.
Andrei Popescu [Mon, 11 Jan 2010 16:03:30 +0000 (08:03 -0800)]
Merge "Update v8/bindings to remove the ANDROID #ifdefs and confirm that DOMData now officially has a virtual dtor."
Andrei Popescu [Mon, 11 Jan 2010 15:36:58 +0000 (15:36 +0000)]
Update v8/bindings to remove the ANDROID #ifdefs and confirm
that DOMData now officially has a virtual dtor.
Changes upstreamed in https://bugs.webkit.org/show_bug.cgi?id=33390
Leon Scroggins [Mon, 11 Jan 2010 15:13:50 +0000 (10:13 -0500)]
resolved conflicts for merge of
9653e7ce to master
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.
Grace Kloba [Fri, 8 Jan 2010 05:58:32 +0000 (21:58 -0800)]
First draft of multitouch in the WebView.
Currently we just handle a simple pinch action. We
will wait for framework support for more complicated
gesture.
When pinch in the webview, zoom level will be changed
on the fly. But we won't re-wrap the text until user
action like double tap, rotate screen.
Double tap will re-layout the page and wrap the text
to the screen width. We try to keep the spot you
tapped at the same place on the screen after relayout.
If the block after relayout fully fit on the current
screen, we will center it for easy reading.
Fix http://b/issue?id=
2360032
Steve Block [Fri, 8 Jan 2010 17:26:04 +0000 (09:26 -0800)]
am
43342a27: am
ee0e4a35: Merge "Updates the use of weak references in the script-to-Java bridge for V8." into eclair-mr2
Merge commit '
43342a276dcdb9e1f8c677f5077d151cd5d6ad07'
* commit '
43342a276dcdb9e1f8c677f5077d151cd5d6ad07':
Updates the use of weak references in the script-to-Java bridge for V8.
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
Andrei Popescu [Fri, 8 Jan 2010 17:06:34 +0000 (09:06 -0800)]
Merge "Fix a code ugliness issue: avoid using two variables named "size" inside the same for loop."
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.
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 13:00:26 +0000 (05:00 -0800)]
am
dd9c60d0: am
5cf18d3a: Merge "Updates V8 version of JavaInstance to use RefCounted, rather than implementing custom ref and deref methods." into eclair-mr2
Merge commit '
dd9c60d0c71b85e87676f43d262ee722357e9f63'
* commit '
dd9c60d0c71b85e87676f43d262ee722357e9f63':
Updates V8 version of JavaInstance to use RefCounted, rather than implementing custom ref and deref methods.
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
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"