OSDN Git Service

android-x86/external-webkit.git
14 years agoMerge "Cherry pick of WebKit revision r54138 (http://trac.webkit.org/changeset/54138...
Ben Murdoch [Tue, 2 Feb 2010 12:52:44 +0000 (04:52 -0800)]
Merge "Cherry pick of WebKit revision r54138 (trac.webkit.org/changeset/54138) to add source and line number information to ScriptCallFrames when the caller is unknown."

14 years agoImplement V8 counter support
Andrei Popescu [Mon, 1 Feb 2010 22:02:39 +0000 (22:02 +0000)]
Implement V8 counter support

14 years agoCherry pick of WebKit revision r54138 (http://trac.webkit.org/changeset/54138) to...
Ben Murdoch [Tue, 2 Feb 2010 10:21:27 +0000 (10:21 +0000)]
Cherry pick of WebKit revision r54138 (trac.webkit.org/changeset/54138) to add source and line number information to ScriptCallFrames when the caller is unknown.

BUG=2376873

Change-Id: I91346705b9c24cf7862070685bf3830d2a18f12e

14 years agoAdd ANDROID tags to some touchevents changes that have yet to be upstreamed
Steve Block [Mon, 1 Feb 2010 16:36:28 +0000 (16:36 +0000)]
Add ANDROID tags to some touchevents changes that have yet to be upstreamed

Change-Id: Ie67cdb2c404c59589f282b2b4494507d5c606f11

14 years agoUpdate Android to reflect final version submitted to webkit.org when changing touchev...
Steve Block [Mon, 1 Feb 2010 16:30:22 +0000 (16:30 +0000)]
Update Android to reflect final version submitted to webkit.org when changing touchevents behavior

See http://trac.webkit.org/changeset/52922

Change-Id: I2057acd590a540744a4d7db6fe9b29b887339906

14 years agoUpdate Android to reflect final version submitted to webkit.org when adding touchcanc...
Steve Block [Mon, 1 Feb 2010 16:16:56 +0000 (16:16 +0000)]
Update Android to reflect final version submitted to webkit.org when adding touchcancel support

See http://trac.webkit.org/changeset/53548

Change-Id: Ie64613b373a88a5333e83e4a9c9cb1e8d72092fb

14 years agoUpdate to Android to reflect final version submitted to webkit.org when adding Chrome...
Steve Block [Mon, 1 Feb 2010 14:59:06 +0000 (14:59 +0000)]
Update to Android to reflect final version submitted to webkit.org when adding ChromeClient::needTouchEvents

See http://trac.webkit.org/changeset/54069

Change-Id: Ie42af496d701863682c52e03613248815b7d7b4f

14 years agoCherry-pick WebKit change 54096 for client-based Geolocation
Steve Block [Mon, 1 Feb 2010 13:28:26 +0000 (13:28 +0000)]
Cherry-pick WebKit change 54096 for client-based Geolocation

See http://trac.webkit.org/changeset/54096

This is required to bring Geolocation up-to-date with webkit.org to allow upstreaming of maximumAge code.

Change-Id: Ic4f06aa2cf4ef8655bd05cd30746d9548f7e0d33

14 years agoCherry-pick WebKit change 54080 for client-based Geolocation
Steve Block [Mon, 1 Feb 2010 12:40:44 +0000 (12:40 +0000)]
Cherry-pick WebKit change 54080 for client-based Geolocation

See http://trac.webkit.org/changeset/54080

This is required to bring Geolocation up-to-date with webkit.org to allow upstreaming of maximumAge code.

Change-Id: Id67cac441eeaa58268c0bfdc8306a047bc56fba9

14 years agoCherry-pick WebKit change 54079 for client-based Geolocation
Steve Block [Mon, 1 Feb 2010 12:39:36 +0000 (12:39 +0000)]
Cherry-pick WebKit change 54079 for client-based Geolocation

See http://trac.webkit.org/changeset/54079

This is required to bring Geolocation up-to-date with webkit.org to allow upstreaming of maximumAge code.

Change-Id: I46b8f439668768fa930c610d4b10c7e45cc1ca01

14 years agoCherry-pick WebKit change 53708 for client-based Geolocation
Steve Block [Mon, 1 Feb 2010 12:36:08 +0000 (12:36 +0000)]
Cherry-pick WebKit change 53708 for client-based Geolocation

See http://trac.webkit.org/changeset/53708

This is required to bring Geolocation up-to-date with webkit.org to allow upstreaming of maximumAge code.

Change-Id: I369d96f8af0fc060ca0c8a9c5a16c5cdf91bedd3

14 years agoMerge "Anchor the page at top left corner when webView size changed."
Shimeng (Simon) Wang [Fri, 29 Jan 2010 23:23:06 +0000 (15:23 -0800)]
Merge "Anchor the page at top left corner when webView size changed."

14 years agoAnchor the page at top left corner when webView size changed.
Shimeng (Simon) Wang [Thu, 28 Jan 2010 23:02:53 +0000 (15:02 -0800)]
Anchor the page at top left corner when webView size changed.

Bug: 2356891
modified:   WebKit/android/jni/WebViewCore.cpp

14 years agoMerge "Cherry pick the diff after going through review on webkit.org bug for 34215...
Ben Murdoch [Fri, 29 Jan 2010 18:05:07 +0000 (10:05 -0800)]
Merge "Cherry pick the diff after going through review on webkit.org bug for 34215 (implementing ChromeClient::needTouchEvents). Landed as r54069. We just needed to add an ifdef guard."

14 years agoCherry pick the diff after going through review on webkit.org bug for 34215 (implemen...
Ben Murdoch [Wed, 27 Jan 2010 16:01:43 +0000 (16:01 +0000)]
Cherry pick the diff after going through review on webkit.org bug for 34215 (implementing ChromeClient::needTouchEvents). Landed as r54069. We just needed to add an ifdef guard.

Change-Id: If3fa0398e756508a718d5d3d93a5dd322a5e3f01

14 years agoMerge "Fix Geolocation to make use of the startUpdating helper method"
Steve Block [Fri, 29 Jan 2010 17:18:57 +0000 (09:18 -0800)]
Merge "Fix Geolocation to make use of the startUpdating helper method"

14 years agoFix Geolocation to make use of the startUpdating helper method
Steve Block [Fri, 29 Jan 2010 16:15:18 +0000 (16:15 +0000)]
Fix Geolocation to make use of the startUpdating helper method

This should have been done as part of the cherry-pick of WebKit change
52103 in https://android-git.corp.google.com/g/#change,37374

This is a syntactic change only, no functional change on Android.

Change-Id: Ic49ac710cafbacd5ff90e92d84b3360a316a43dd

14 years agoMerge "Changes to make Bridge.h script-engine independent are complete"
Steve Block [Thu, 28 Jan 2010 12:43:39 +0000 (04:43 -0800)]
Merge "Changes to make Bridge.h script-engine independent are complete"

14 years agoAdd request header support for the Browser/WebView.
Grace Kloba [Wed, 27 Jan 2010 02:11:52 +0000 (18:11 -0800)]
Add request header support for the Browser/WebView.
QSB can use this instead of POST to send the location
data. After QSB makes the switch, we should also
remove the POST_DATA intent which is hidden.

Add loadUrl(String url, HashMap extraHeaders) to
WebView so that the caller can send the extra http
headers.

Remove "inline:" as no one is using it and it is a
hidden feature.

Part 3 of 3-project checkin.

14 years agoMerge "No text wrapping in FitToScreen mode when text has background image."
Shimeng (Simon) Wang [Wed, 27 Jan 2010 19:33:06 +0000 (11:33 -0800)]
Merge "No text wrapping in FitToScreen mode when text has background image."

14 years agoChanges to make Bridge.h script-engine independent are complete
Steve Block [Wed, 27 Jan 2010 19:28:00 +0000 (19:28 +0000)]
Changes to make Bridge.h script-engine independent are complete

See https://bugs.webkit.org/show_bug.cgi?id=32154

Change-Id: I76355f3e002af505560a8a8cfce1c98322f66230

14 years agoNo text wrapping in FitToScreen mode when text has background image.
Shimeng (Simon) Wang [Wed, 27 Jan 2010 18:44:45 +0000 (10:44 -0800)]
No text wrapping in FitToScreen mode when text has background image.

Bug: 2225518

modified:   WebCore/rendering/RenderBlockLineLayout.cpp

14 years agoV8 can now use WebCore/bridge/jni/JNIBridge.cpp
Steve Block [Thu, 21 Jan 2010 19:12:36 +0000 (19:12 +0000)]
V8 can now use WebCore/bridge/jni/JNIBridge.cpp

JNIBridge.cpp is now used by both JSC and V8

This removes the last file from V8Bindings

$ diff WebCore/bridge/jni/JNIBridge.cpp V8Binding/jni/jni_runtime.cpp
2d1
<  * Copyright (C) 2003, 2004, 2005, 2007, 2009 Apple Inc. All rights reserved.
28c27
< #include "JNIBridge.h"
---
> #include "jni_runtime.h"
30,32c29
< #if ENABLE(MAC_JAVA_BRIDGE)
<
< #include "CString.h"
---
> #include "JNIUtility.h"
35,45d31
<
< #ifdef NDEBUG
< #define JS_LOG(formatAndArgs...) ((void)0)
< #else
< #define JS_LOG(formatAndArgs...) { \
<     fprintf(stderr, "%s:%d -- %s:  ", __FILE__, __LINE__, __FUNCTION__); \
<     fprintf(stderr, formatAndArgs); \
< }
< #endif
<
< using namespace JSC;
49d34
<
106,109d90
< #if USE(JSC)
<     ASSERT(JSLock::lockCount() > 0);
< #endif
<
127,130d107
< #if USE(JSC)
<         JSLock lock(SilenceAssertionsOnly);
< #endif
<
177,178d153
<
< #endif // ENABLE(MAC_JAVA_BRIDGE)

Change-Id: I3f0aabc5af56083aa950eca1609b2fe9b46726c9

14 years agoV8 can now use WebCore/bridge/jni/JNIBridge.h
Steve Block [Thu, 21 Jan 2010 19:08:14 +0000 (19:08 +0000)]
V8 can now use WebCore/bridge/jni/JNIBridge.h

JNIBridge.h is now used by both JSC and V8

$ diff WebCore/bridge/jni/JNIBridge.h V8Binding/jni/jni_runtime.h
2d1
<  * Copyright (C) 2003, 2004, 2005, 2007, 2009, 2010 Apple Inc. All rights reserved.
27,30c26,27
< #ifndef JNIBridge_h
< #define JNIBridge_h
<
< #if ENABLE(MAC_JAVA_BRIDGE)
---
> #ifndef jni_runtime_h
> #define jni_runtime_h
31a29
> #include "Bridge.h"
34,35c32,33
< #if USE(JSC)
< #include "JavaStringJSC.h"
---
> #if USE(V8)
> #include "JavaStringV8.h"
64,66d61
< #if USE(JSC)
<     operator UString() const { return m_impl.uString(); }
< #endif
118,120c113
< #endif // ENABLE(MAC_JAVA_BRIDGE)
<
< #endif // JNIBridge_h
---
> #endif // jni_runtime_h

Change-Id: I59c7dafb295aa7c81e79283333266c3f9f5a9a52

14 years agoMerge changes I0ab68eac,Ide43a042,I0c11519b,I1ef80088
Steve Block [Wed, 27 Jan 2010 15:11:46 +0000 (07:11 -0800)]
Merge changes I0ab68eac,Ide43a042,I0c11519b,I1ef80088

* changes:
  Update Android to reflect final version submitted to webkit.org for ScriptController
  Update Android to reflect final version submitted to webkit.org for touch events.
  Update Android to reflect final version submitted to webkit.org for V8 TODOs
  Update Android to reflect final version submitted to webkit.org for adding NetworkStateNotifier::networkStateChange

14 years agoMerge "Fixes Geolocation maximumAge implementation to work when requestPermission...
Steve Block [Wed, 27 Jan 2010 15:10:56 +0000 (07:10 -0800)]
Merge "Fixes Geolocation maximumAge implementation to work when requestPermission is synchronous"

14 years agoUpdate Android to reflect final version submitted to webkit.org for ScriptController
Steve Block [Wed, 27 Jan 2010 14:52:17 +0000 (14:52 +0000)]
Update Android to reflect final version submitted to webkit.org for ScriptController

See https://android-git.corp.google.com/g/#change,37366 and
http://trac.webkit.org/changeset/53673

Change-Id: I0ab68eac66a29b14ad3c169611843ae83bab8a45

14 years agoUpdate Android to reflect final version submitted to webkit.org for touch events.
Steve Block [Wed, 27 Jan 2010 14:43:07 +0000 (14:43 +0000)]
Update Android to reflect final version submitted to webkit.org for touch events.

See https://android-git.corp.google.com/g/#change,37040
http://trac.webkit.org/changeset/51981 and
http://trac.webkit.org/changeset/53548

Change-Id: Ide43a0425cff940bfd07022d8e9bb72e3d12ce96

14 years agoUpdate Android to reflect final version submitted to webkit.org for V8 TODOs
Steve Block [Wed, 27 Jan 2010 14:38:15 +0000 (14:38 +0000)]
Update Android to reflect final version submitted to webkit.org for V8 TODOs

See https://android-git.corp.google.com/g/#change,38144 and http://trac.webkit.org/changeset/53630

Change-Id: I0c11519bada84ed20af462e3a72c0fa931a7786e

14 years agoUpdate Android to reflect final version submitted to webkit.org for adding NetworkSta...
Steve Block [Wed, 27 Jan 2010 14:32:22 +0000 (14:32 +0000)]
Update Android to reflect final version submitted to webkit.org for adding NetworkStateNotifier::networkStateChange

See http://trac.webkit.org/changeset/52635

Change-Id: I1ef80088f3d72f088140a478dd65d9fe5a287432

14 years agoMerge "Updates V8 versions of JavaMethod and JavaParameter to match JSC versions"
Steve Block [Wed, 27 Jan 2010 12:58:52 +0000 (04:58 -0800)]
Merge "Updates V8 versions of JavaMethod and JavaParameter to match JSC versions"

14 years agoStop forwarding touch events from Java when the top level document is detached rather...
Ben Murdoch [Fri, 22 Jan 2010 10:39:19 +0000 (10:39 +0000)]
Stop forwarding touch events from Java when the top level document is detached rather than when eventHandlers are cleared for a frame.
Also no longer keep track of the number of touch event handlers that a page has registered. If a page requests touch events, always
send them from Java until a new page is loaded. This simplifies the logic when dealing with the page cache as otherwise as well as
restoring the forwarding of touch events when a page is restored from the page cache, we would need to restore the number of touch handlers
that have been registered.

Change-Id: I0269e1632a37ccbf105bac658c2cb7f1d5cd3052

14 years agoMerge "Remove dead code attached to the Touch object. This is no longer called, and...
Ben Murdoch [Wed, 27 Jan 2010 10:04:20 +0000 (02:04 -0800)]
Merge "Remove dead code attached to the Touch object. This is no longer called, and keeping a ref to a child frame can cause a crash during GC if the event is the last ref and causes the Frame to be destructed."

14 years agoUpdates V8 versions of JavaMethod and JavaParameter to match JSC versions
Steve Block [Thu, 21 Jan 2010 13:42:21 +0000 (13:42 +0000)]
Updates V8 versions of JavaMethod and JavaParameter to match JSC versions

V8 versions of JavaMethod and JavaParameter are provided by jni_runtime.
This change updates those classes to match the JSC versions in JNIBridge.
The changes are syntactic only and do not affect behavior.
This will allow jni_runtime to be merged with JNIBridge.

Change-Id: I2fceed94e1b57d133a068f51a2a40797447b7b58

14 years agoFix memory leak with layers.
Nicolas Roard [Mon, 25 Jan 2010 19:19:18 +0000 (19:19 +0000)]
Fix memory leak with layers.
This fix bug http://b/2394813
This is a two-parts CL (need a java modif)

- The main leak is in WebView.cpp -- nativeUpdateLayers could
  bail out if the root layer was nil, without deallocating the vector
  of updates.
- fix a leak in LayerAndroid::evaluateAnimations()
- adoptRef() for the contentLayer in GraphicsLayerAndroid
- simplify AndroidAnimation: remove the reference to the layer
  (the layer already has a reference to AndroidAnimation)
- modify the AndroidAnimation copy() methods to return directly
  a PassRefPtr, for consistency.

14 years agoRemove dead code attached to the Touch object. This is no longer called, and keeping...
Ben Murdoch [Tue, 26 Jan 2010 18:02:54 +0000 (18:02 +0000)]
Remove dead code attached to the Touch object. This is no longer called, and keeping a ref to a child frame can cause a crash during GC if the event is the last ref and causes the Frame to be destructed.

Change-Id: Ic41adfa3e8b4a901887c87b8196360947ef9692c

14 years agoFix potential crash with layers enabled.
Nicolas Roard [Mon, 25 Jan 2010 22:10:44 +0000 (22:10 +0000)]
Fix potential crash with layers enabled.
See bug http://b/2395197
We remove the AndroidAnimationTimer class, and use a callback mechanism instead
in GraphicsLayerAndroid.

14 years agoFixes Geolocation maximumAge implementation to work when requestPermission is synchronous
Steve Block [Mon, 25 Jan 2010 17:18:32 +0000 (17:18 +0000)]
Fixes Geolocation maximumAge implementation to work when requestPermission is synchronous

Geolocation::requestPermission may be implemented synchronously or asynchronously.
See https://bugs.webkit.org/show_bug.cgi?id=26993

The current implementation of maximumAge on Android requires that requestPermission is asynchronous.
This change fixes the code to work with both synchronous and asynchronous implementations of requestPermission.
This will allow the maximumAge code to be upstreamed to webkit.org.
See https://bugs.webkit.org/show_bug.cgi?id=30676

Change-Id: If7115e5d34ec308c91a1873a6841731dc37c18bd

14 years agoMoves V8's JavaField from V8's jni_runtime to JavaClassV8 and fixes style
Steve Block [Thu, 21 Jan 2010 14:45:47 +0000 (14:45 +0000)]
Moves V8's JavaField from V8's jni_runtime to JavaClassV8 and fixes style

JavaField is script-engine specific. The JSC version of JavaField was moved out
of the script-independent file JNIBridge (previosuly named jni_runtime) in
http://trac.webkit.org/changeset/53849

This change makes the equivalent move for V8.

This will make V8's version of jni_runtime script-independent, allowing it to be
merged with JNIBridge in WebCore in the future.

This change is being upstreamed to webkit.org in
https://bugs.webkit.org/show_bug.cgi?id=34166

Change-Id: I7b35bfe4e8e7820623a824028eb64d06421bdb6b

14 years agoMerge "Moves the Geolocation position cache out of the Geolocation object."
Steve Block [Tue, 26 Jan 2010 16:33:05 +0000 (08:33 -0800)]
Merge "Moves the Geolocation position cache out of the Geolocation object."

14 years agoMerge "Update V8 JavaMethod::signature to use appendClassName() to match JSC version"
Steve Block [Tue, 26 Jan 2010 16:21:14 +0000 (08:21 -0800)]
Merge "Update V8 JavaMethod::signature to use appendClassName() to match JSC version"

14 years agoMerge "translate3d() wasn't handled as we only have a 2D backend for the moment....
Nicolas Roard [Tue, 26 Jan 2010 16:20:50 +0000 (08:20 -0800)]
Merge "translate3d() wasn't handled as we only have a 2D backend for the moment. But it should still work for the (x,y) components anyway... Fix bug b/2395354"

14 years agotranslate3d() wasn't handled as we only have a 2D backend for the moment.
Nicolas Roard [Mon, 25 Jan 2010 22:43:15 +0000 (22:43 +0000)]
translate3d() wasn't handled as we only have a 2D backend for the moment.
But it should still work for the (x,y) components anyway...
Fix bug http://b/2395354

14 years agoUpdate V8 JavaMethod::signature to use appendClassName() to match JSC version
Steve Block [Thu, 21 Jan 2010 18:50:58 +0000 (18:50 +0000)]
Update V8 JavaMethod::signature to use appendClassName() to match JSC version

The JSC version was made script-engine-independent in http://trac.webkit.org/changeset/53193

Change-Id: Ie4d3a6afc146cc18a3b6a65eed16ff7bcdb8d447

14 years agoMerge "Cherry-pick WebKit change 53849 to move JavaField and JavaArray from JNIBridge...
Steve Block [Tue, 26 Jan 2010 13:37:56 +0000 (05:37 -0800)]
Merge "Cherry-pick WebKit change 53849 to move JavaField and JavaArray from JNIBridge to JNIBridgeJSC"

14 years agoCherry-pick WebKit change 53849 to move JavaField and JavaArray from JNIBridge to...
Steve Block [Tue, 26 Jan 2010 12:49:16 +0000 (12:49 +0000)]
Cherry-pick WebKit change 53849 to move JavaField and JavaArray from JNIBridge to JNIBridgeJSC

See http://trac.webkit.org/changeset/53849
This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge.

Change-Id: Ic73bf8213ae677b69e763a6b04f8c94f7f1eaed1

14 years agoabsoluteToLocal works with a page co-ordinate that is relative to the top left of...
Ben Murdoch [Fri, 22 Jan 2010 10:40:22 +0000 (10:40 +0000)]
absoluteToLocal works with a  page co-ordinate that is relative to the top left of the containing frame's document, so fix a bug in the WebCore touch event handler where the wrong page co-ordinates were being passed to the Touch construtor. This part of the change should be upstreamed to webkit.

Also fix a crash when a touchCancel event is sent to a plugin because touchCancel, like touchend is not guaranteed to have data in touches, but will have data in changedTouches.

Change-Id: I5345d7baf4e4325b24fbc5fbe60132dafb80e006

14 years agoam 562a8a46: am 53c84f3c: Do not allow the plugin to show or hide the keyboard unless...
Derek Sollenberger [Mon, 25 Jan 2010 21:26:14 +0000 (13:26 -0800)]
am 562a8a46: am 53c84f3c: Do not allow the plugin to show or hide the keyboard unless it has focus.

Merge commit '562a8a469695e0a2dee4eb1946847553f04ca2a2'

* commit '562a8a469695e0a2dee4eb1946847553f04ca2a2':
  Do not allow the plugin to show or hide the keyboard unless it has focus.

14 years agoam 53c84f3c: Do not allow the plugin to show or hide the keyboard unless it has focus.
Derek Sollenberger [Mon, 25 Jan 2010 21:18:25 +0000 (13:18 -0800)]
am 53c84f3c: Do not allow the plugin to show or hide the keyboard unless it has focus.

Merge commit '53c84f3caf7c84282400134fa9554cd465ec7da8' into eclair-mr2-plus-aosp

* commit '53c84f3caf7c84282400134fa9554cd465ec7da8':
  Do not allow the plugin to show or hide the keyboard unless it has focus.

14 years agoDo not allow the plugin to show or hide the keyboard unless it has focus.
Derek Sollenberger [Mon, 25 Jan 2010 20:12:16 +0000 (15:12 -0500)]
Do not allow the plugin to show or hide the keyboard unless it has focus.

14 years agoam 71ce050b: am c45f962c: Merge "Correcting how the plugin\'s bounding coordinates...
Derek Sollenberger [Mon, 25 Jan 2010 19:39:14 +0000 (11:39 -0800)]
am 71ce050b: am c45f962c: Merge "Correcting how the plugin\'s bounding coordinates are computed." into eclair-mr2

Merge commit '71ce050b9dbf42b1f1f33269021af49371c20a54'

* commit '71ce050b9dbf42b1f1f33269021af49371c20a54':
  Correcting how the plugin's bounding coordinates are computed.

14 years agoam c45f962c: Merge "Correcting how the plugin\'s bounding coordinates are computed...
Derek Sollenberger [Mon, 25 Jan 2010 19:31:04 +0000 (11:31 -0800)]
am c45f962c: Merge "Correcting how the plugin\'s bounding coordinates are computed." into eclair-mr2

Merge commit 'c45f962cdbdd4a870b7af94ce48f48e36c5b53cb' into eclair-mr2-plus-aosp

* commit 'c45f962cdbdd4a870b7af94ce48f48e36c5b53cb':
  Correcting how the plugin's bounding coordinates are computed.

14 years agoMerge "Correcting how the plugin's bounding coordinates are computed." into eclair-mr2
Derek Sollenberger [Mon, 25 Jan 2010 19:24:46 +0000 (11:24 -0800)]
Merge "Correcting how the plugin's bounding coordinates are computed." into eclair-mr2

14 years agoCorrecting how the plugin's bounding coordinates are computed.
Derek Sollenberger [Mon, 25 Jan 2010 15:10:50 +0000 (10:10 -0500)]
Correcting how the plugin's bounding coordinates are computed.

14 years agoresolved conflicts for merge of 98c97471 to master
Grace Kloba [Mon, 25 Jan 2010 18:53:28 +0000 (10:53 -0800)]
resolved conflicts for merge of 98c97471 to master

14 years agoMoves the Geolocation position cache out of the Geolocation object.
Steve Block [Mon, 25 Jan 2010 18:03:49 +0000 (18:03 +0000)]
Moves the Geolocation position cache out of the Geolocation object.

The position cache is an implementation detail of the Geolocation object,
but is being moved to its own file to keep files to a reasonable size.
Also updates some names and fixes soem style.

This will be upstreamed in
https://bugs.webkit.org/show_bug.cgi?id=34084

The maximumAge code in the Geolocation object,
which may make use of this caching, is being upstreamed in
https://bugs.webkit.org/show_bug.cgi?id=30676

Change-Id: I083556de732bd7be240a75da5369117aabc50e33

14 years agoMerge "allow text node boundaries to delimit addresses"
Cary Clark [Mon, 25 Jan 2010 18:29:42 +0000 (10:29 -0800)]
Merge "allow text node boundaries to delimit addresses"

14 years agoam f7dbff09: Merge "Rearrange the include headers to enable logging." into eclair-mr2
Grace Kloba [Mon, 25 Jan 2010 18:28:52 +0000 (10:28 -0800)]
am f7dbff09: Merge "Rearrange the include headers to enable logging." into eclair-mr2

Merge commit 'f7dbff09c8d416459a317e397e0a46c197dbf862' into eclair-mr2-plus-aosp

* commit 'f7dbff09c8d416459a317e397e0a46c197dbf862':
  Rearrange the include headers to enable logging.

14 years agoMerge "Rearrange the include headers to enable logging." into eclair-mr2
Grace Kloba [Mon, 25 Jan 2010 18:21:31 +0000 (10:21 -0800)]
Merge "Rearrange the include headers to enable logging." into eclair-mr2

14 years agoMerge changes Ib69ddd4d,Ib28c69a6,I342b9f6b
Steve Block [Mon, 25 Jan 2010 18:10:04 +0000 (10:10 -0800)]
Merge changes Ib69ddd4d,Ib28c69a6,I342b9f6b

* changes:
  Cherry-pick WebKit change 53441 to make changes to Geolocation
  Bring Geolocation up-to-date with WebKit change 53342 to make suspend/resume public
  Cherry-pick WebKit change 52104 to make changes to Geolocation

14 years agoallow text node boundaries to delimit addresses
Cary Clark [Mon, 25 Jan 2010 17:49:57 +0000 (12:49 -0500)]
allow text node boundaries to delimit addresses

The current boundary condition for a state without a trailing
zip code is a couple of spaces or a non-alphanumeric character,
like punctuation. Add allowing the end of the text node as
a termination condition.

Fixes http://b/2384326

14 years agoMerge "Merge pinch zoom from Eclair to Master. Including,"
Grace Kloba [Mon, 25 Jan 2010 17:41:33 +0000 (09:41 -0800)]
Merge "Merge pinch zoom from Eclair to Master. Including,"

14 years agoRearrange the include headers to enable logging.
Grace Kloba [Mon, 25 Jan 2010 17:21:10 +0000 (09:21 -0800)]
Rearrange the include headers to enable logging.

14 years agoam 53e1af87: am 2eb76d0b: Add logging for all plugin events and their return values.
Derek Sollenberger [Mon, 25 Jan 2010 15:39:50 +0000 (07:39 -0800)]
am 53e1af87: am 2eb76d0b: Add logging for all plugin events and their return values.

Merge commit '53e1af87fa4f19eac50b3d6fb45a3a386d156cd0'

* commit '53e1af87fa4f19eac50b3d6fb45a3a386d156cd0':
  Add logging for all plugin events and their return values.

14 years agoam 2eb76d0b: Add logging for all plugin events and their return values.
Derek Sollenberger [Mon, 25 Jan 2010 15:22:37 +0000 (07:22 -0800)]
am 2eb76d0b: Add logging for all plugin events and their return values.

Merge commit '2eb76d0bcdf5cdc45cf6188c8bb76a409612235b' into eclair-mr2-plus-aosp

* commit '2eb76d0bcdf5cdc45cf6188c8bb76a409612235b':
  Add logging for all plugin events and their return values.

14 years agoAdd logging for all plugin events and their return values.
Derek Sollenberger [Fri, 22 Jan 2010 19:40:05 +0000 (14:40 -0500)]
Add logging for all plugin events and their return values.

14 years agoCherry-pick WebKit change 53441 to make changes to Geolocation
Steve Block [Fri, 22 Jan 2010 14:51:37 +0000 (14:51 +0000)]
Cherry-pick WebKit change 53441 to make changes to Geolocation

See http://trac.webkit.org/changeset/53441

This is required to bring Geolocation up-to-date with webkit.org to allow upstreaming of maximumAge code.

Change-Id: Ib69ddd4d1b0944c861ac6c35412936ec1209cff0

14 years agoBring Geolocation up-to-date with WebKit change 53342 to make suspend/resume public
Steve Block [Fri, 22 Jan 2010 14:44:13 +0000 (14:44 +0000)]
Bring Geolocation up-to-date with WebKit change 53342 to make suspend/resume public

See http://trac.webkit.org/changeset/53342

Change-Id: Ib28c69a686d72ea4fb17b52b6476bfc5696b1db3

14 years agoCherry-pick WebKit change 52104 to make changes to Geolocation
Steve Block [Fri, 22 Jan 2010 15:13:04 +0000 (15:13 +0000)]
Cherry-pick WebKit change 52104 to make changes to Geolocation

See http://trac.webkit.org/changeset/52104

This is required to bring Geolocation up-to-date with webkit.org to allow upstreaming of maximumAge code.

Change-Id: I342b9f6b6ef5a25fac37dd2187a67a834fb7e270

14 years agoFix build by
Andrei Popescu [Mon, 25 Jan 2010 12:15:50 +0000 (12:15 +0000)]
Fix build by
- adding WebCore/svg to the include path. This should not be guarded by #if ENABLE(SVG) in the makefiles.
- calling PluginView::getNPObject from PlatformBridge only when V8 is used.

14 years agoPrepare NPV8Object.h/cpp for upstreaming:
Andrei Popescu [Wed, 13 Jan 2010 18:43:00 +0000 (18:43 +0000)]
Prepare NPV8Object.h/cpp for upstreaming:

- remove #include bindings/npruntime.h from NPV8Object.cpp since that's also included in the NPV8Object.h
- add ARRAYSIZE_UNSAFE macro
- remove some TODOS

This will be checked in after the corresponding webkit bug gets landed.

See https://bugs.webkit.org/show_bug.cgi?id=33608

14 years agoMerge "Prepare ScriptController class for upstreaming."
Andrei Popescu [Mon, 25 Jan 2010 11:38:53 +0000 (03:38 -0800)]
Merge "Prepare ScriptController class for upstreaming."

14 years agoMerge "Remove Android-specific TODOs as the changes have been upstreamed in"
Andrei Popescu [Mon, 25 Jan 2010 11:38:47 +0000 (03:38 -0800)]
Merge "Remove Android-specific TODOs as the changes have been upstreamed in"

14 years agoMerge pinch zoom from Eclair to Master. Including,
Grace Kloba [Sat, 23 Jan 2010 18:09:03 +0000 (10:09 -0800)]
Merge pinch zoom from Eclair to Master. Including,

commit 237bd75b6ebc1298cbd1c46b43903d19d7dd18b1
commit dbb3061334333f32b6f12c294a551bd2a4a3844c
commit f48712a096831a3b85a5e18dabd44a541f6b4712
commit b99dd716b4af0afde074e28b50b7b28ae3c03da7

14 years agoCall nextTextfield on the CachedFrame that contains the cursor/focus.
Leon Scroggins [Fri, 22 Jan 2010 16:32:42 +0000 (11:32 -0500)]
Call nextTextfield on the CachedFrame that contains the cursor/focus.

Fixes http://b/issue?id=2359748

14 years agoRemove Android-specific TODOs as the changes have been upstreamed in
Andrei Popescu [Fri, 22 Jan 2010 15:14:56 +0000 (15:14 +0000)]
Remove Android-specific TODOs as the changes have been upstreamed in

https://bugs.webkit.org/show_bug.cgi?id=33944

14 years agoPrepare ScriptController class for upstreaming.
Andrei Popescu [Thu, 14 Jan 2010 15:33:28 +0000 (15:33 +0000)]
Prepare ScriptController class for upstreaming.

Move the code to obtain the NPObject ptr associated with a PluginView to the PlatformBridge.

This change will be submitted as soon as the patch in

https://bugs.webkit.org/show_bug.cgi?id=33673

lands upstream.

14 years agoam de7e9124: am ec4b5ee4: As we are sharing the view between embedded and full screen...
Grace Kloba [Fri, 22 Jan 2010 03:40:14 +0000 (19:40 -0800)]
am de7e9124: am ec4b5ee4: As we are sharing the view between embedded and full screen, we should make sure to call the correct update when bounds changed.

Merge commit 'de7e9124bea659d873d5488809d92a334104cb53'

* commit 'de7e9124bea659d873d5488809d92a334104cb53':
  As we are sharing the view between embedded and full

14 years agoam ec4b5ee4: As we are sharing the view between embedded and full screen, we should...
Grace Kloba [Fri, 22 Jan 2010 03:27:06 +0000 (19:27 -0800)]
am ec4b5ee4: As we are sharing the view between embedded and full screen, we should make sure to call the correct update when bounds changed.

Merge commit 'ec4b5ee43c88d914221e8c9f668421ace6bdd72d' into eclair-mr2-plus-aosp

* commit 'ec4b5ee43c88d914221e8c9f668421ace6bdd72d':
  As we are sharing the view between embedded and full

14 years agoAs we are sharing the view between embedded and full
Grace Kloba [Fri, 22 Jan 2010 03:13:23 +0000 (19:13 -0800)]
As we are sharing the view between embedded and full
screen, we should make sure to call the correct
update when bounds changed.

This should fix the crash when changing orientation.

14 years agoam 6d849f2b: (-s ours) am b99dd716: DO NOT MERGE
Grace Kloba [Fri, 22 Jan 2010 01:57:57 +0000 (17:57 -0800)]
am 6d849f2b: (-s ours) am b99dd716: DO NOT MERGE

Merge commit '6d849f2b09b0aa503957a037f2e8a276bd6f8041'

* commit '6d849f2b09b0aa503957a037f2e8a276bd6f8041':
  DO NOT MERGE

14 years agoMerge commit 'db0b7b50' into merge
Grace Kloba [Thu, 21 Jan 2010 23:05:04 +0000 (15:05 -0800)]
Merge commit 'db0b7b50' into merge

14 years agoMerge commit '91d051d3' into tmp
Grace Kloba [Thu, 21 Jan 2010 21:52:03 +0000 (13:52 -0800)]
Merge commit '91d051d3' into tmp

14 years agoRemoving reference to a java object that is no longer used.
Derek Sollenberger [Thu, 21 Jan 2010 20:04:15 +0000 (15:04 -0500)]
Removing reference to a java object that is no longer used.

The native plugin code was creating a java object that was
intended to by used by the old Gears code.  The java object
has been deprecated and is not being used within the native
code.

14 years agoMerge changes I1b4ba984,I6cadc4f4,Icf99c709,Id22d59b7,I63f3c4ed
Steve Block [Thu, 21 Jan 2010 18:38:22 +0000 (10:38 -0800)]
Merge changes I1b4ba984,I6cadc4f4,Icf99c709,Id22d59b7,I63f3c4ed

* changes:
  Fixes style in V8 jni_runtime.[cpp|h]
  Updates V8 version of JavaString to use a private implementation class.
  Move V8 jni_npobject to bridge/jni/v8/JavaNPObjectV8 and fix style
  Move V8 jni_instance to bridge/jni/v8/JavaInstanceV8 and fix style
  Cherry-pick WebKit change 53620 to move bridge interfaces Field, Class, Instance and Array from Bridge to BridgeJSC

14 years agoFixes style in V8 jni_runtime.[cpp|h]
Steve Block [Thu, 21 Jan 2010 16:35:56 +0000 (16:35 +0000)]
Fixes style in V8 jni_runtime.[cpp|h]

This change makes it far easier to compare these files with WebCore/bridge/jni/Bridge.[cpp|h],
with which these files will eventually be merged.

Change-Id: I1b4ba9843f61c909568f85c65a0872a36d727fb3

14 years agoUpdates V8 version of JavaString to use a private implementation class.
Steve Block [Wed, 20 Jan 2010 13:20:50 +0000 (13:20 +0000)]
Updates V8 version of JavaString to use a private implementation class.

WebKit change http://trac.webkit.org/changeset/53449 moved the JSC-specific implementation
of JavaString to JavaStringJSC.h. This is the V8 equivalent of that change.

This is being upstreamed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=33953

Change-Id: I6cadc4f4f941aab900aeaf3251a5cad77d050b9b

14 years agoMove V8 jni_npobject to bridge/jni/v8/JavaNPObjectV8 and fix style
Steve Block [Thu, 21 Jan 2010 15:58:20 +0000 (15:58 +0000)]
Move V8 jni_npobject to bridge/jni/v8/JavaNPObjectV8 and fix style

Change-Id: Icf99c709929ef14551de61e55780b97767575f01

14 years agoMove V8 jni_instance to bridge/jni/v8/JavaInstanceV8 and fix style
Steve Block [Thu, 21 Jan 2010 15:36:39 +0000 (15:36 +0000)]
Move V8 jni_instance to bridge/jni/v8/JavaInstanceV8 and fix style

This is the V8 equivalent of http://trac.webkit.org/changeset/53412
It is being upstreamed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=33951

Change-Id: Id22d59b7a5e0be72d594d454bb41c58760d824ff

14 years agoMerge "Refactor style of Android specific touch events code in preparation for upstre...
Ben Murdoch [Thu, 21 Jan 2010 17:51:37 +0000 (09:51 -0800)]
Merge "Refactor style of Android specific touch events code in preparation for upstreaming to webkit.org."

14 years agoRefactor style of Android specific touch events code in preparation for upstreaming...
Ben Murdoch [Thu, 21 Jan 2010 12:24:38 +0000 (12:24 +0000)]
Refactor style of Android specific touch events code in preparation for upstreaming to webkit.org.

Change-Id: Id34e727145fe94e98e62a36b7fc8256468b4157c

14 years agoMerge "Cherry-pick WebKit change 53619 to fix style in JNIBridge"
Steve Block [Thu, 21 Jan 2010 13:55:11 +0000 (05:55 -0800)]
Merge "Cherry-pick WebKit change 53619 to fix style in JNIBridge"

14 years agoMerge "Cherry-pick WebKit change 53557 to rename jni_runtime to JNIBridge"
Steve Block [Thu, 21 Jan 2010 13:54:50 +0000 (05:54 -0800)]
Merge "Cherry-pick WebKit change 53557 to rename jni_runtime to JNIBridge"

14 years agoCherry-pick WebKit change 53620 to move bridge interfaces Field, Class, Instance...
Steve Block [Thu, 21 Jan 2010 11:40:34 +0000 (11:40 +0000)]
Cherry-pick WebKit change 53620 to move bridge interfaces Field, Class, Instance and Array from Bridge to BridgeJSC

See http://trac.webkit.org/changeset/53620
This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge.

Note that changes to WebCore.xcodeproj were not pulled, as they introduced merge conflicts.

Change-Id: I63f3c4ed101badaea3207d53784de04aee49c2ab

14 years agoCherry-pick WebKit change 53619 to fix style in JNIBridge
Steve Block [Thu, 21 Jan 2010 11:25:18 +0000 (11:25 +0000)]
Cherry-pick WebKit change 53619 to fix style in JNIBridge

See http://trac.webkit.org/changeset/53619
This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge.

Change-Id: Ic34c760d412b022935a8770cc4b842619c008f15

14 years agoCherry-pick WebKit change 53557 to rename jni_runtime to JNIBridge
Steve Block [Thu, 21 Jan 2010 11:23:07 +0000 (11:23 +0000)]
Cherry-pick WebKit change 53557 to rename jni_runtime to JNIBridge

See http://trac.webkit.org/changeset/53557
This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge.

Change-Id: I9a74b4dbdb0a9580372d69cec9e8f9fcab750e49

14 years agoam bfcc13fc: (-s ours) am 0a3f01ac: Merge "DO NOT MERGE" into eclair-mr2
Grace Kloba [Thu, 21 Jan 2010 03:15:33 +0000 (19:15 -0800)]
am bfcc13fc: (-s ours) am 0a3f01ac: Merge "DO NOT MERGE" into eclair-mr2

Merge commit 'bfcc13fc3ee6845e9f78ca7c5313d483c9fd56c9'

* commit 'bfcc13fc3ee6845e9f78ca7c5313d483c9fd56c9':
  DO NOT MERGE

14 years agoam 67c90537: am 72acb46d: Fix the crash of exiting full screen by checking null.
Grace Kloba [Thu, 21 Jan 2010 03:14:00 +0000 (19:14 -0800)]
am 67c90537: am 72acb46d: Fix the crash of exiting full screen by checking null.

Merge commit '67c90537fc70147ad8943f0a2cd02def405bcf8f'

* commit '67c90537fc70147ad8943f0a2cd02def405bcf8f':
  Fix the crash of exiting full screen by checking null.

14 years agoam 0a3f01ac: Merge "DO NOT MERGE" into eclair-mr2
Grace Kloba [Thu, 21 Jan 2010 03:01:48 +0000 (19:01 -0800)]
am 0a3f01ac: Merge "DO NOT MERGE" into eclair-mr2

Merge commit '0a3f01ac5e5855c3563694671091d4c1ce89cac5' into eclair-mr2-plus-aosp

* commit '0a3f01ac5e5855c3563694671091d4c1ce89cac5':
  DO NOT MERGE

14 years agoMerge "DO NOT MERGE" into eclair-mr2
Grace Kloba [Thu, 21 Jan 2010 02:59:05 +0000 (18:59 -0800)]
Merge "DO NOT MERGE" into eclair-mr2