OSDN Git Service
Andrei Popescu [Mon, 8 Feb 2010 21:23:18 +0000 (21:23 +0000)]
Implement navigator.isApplicationInstalled() API
This CL contains the V8 DOM bindings and IDL changes.
Fix b:
2371005
The Android Open Source Project [Fri, 5 Feb 2010 22:24:36 +0000 (14:24 -0800)]
am
8e03c5a1: am
c3e14116: reconcile main tree with open-source eclair
Merge commit '
8e03c5a1ccd98fdf4960318b8c0e3e0c7c5c225b'
* commit '
8e03c5a1ccd98fdf4960318b8c0e3e0c7c5c225b':
android-2.1_r1 snapshot
Mike Reed [Fri, 5 Feb 2010 22:00:38 +0000 (17:00 -0500)]
use SkPaint::containsText for much faster containsCharacters in webkit
The Android Open Source Project [Fri, 5 Feb 2010 16:49:21 +0000 (08:49 -0800)]
am
c3e14116: reconcile main tree with open-source eclair
Merge commit '
c3e141168cbc8e4ca4cb7355210237aed4807ee1' into eclair-plus-aosp
* commit '
c3e141168cbc8e4ca4cb7355210237aed4807ee1':
android-2.1_r1 snapshot
Check null for WebViewCore's nativeClass before calling
The Android Open Source Project [Fri, 5 Feb 2010 16:09:37 +0000 (08:09 -0800)]
reconcile main tree with open-source eclair
Steve Block [Fri, 5 Feb 2010 15:10:43 +0000 (15:10 +0000)]
Speculative build fix for sim-eng
Change-Id: I8cdd95a002b21c317e77eb456d3eddf2f3036cc1
Steve Block [Tue, 2 Feb 2010 18:47:35 +0000 (18:47 +0000)]
Merge webkit.org at r54127 : Update WEBKIT_MERGE_REVISION
Change-Id: Ifb43cc186611cc8a9b89552132f85e4f46e182ee
Steve Block [Tue, 2 Feb 2010 18:52:14 +0000 (18:52 +0000)]
Merge webkit.org at r54127 : Fix missing virtual destructors in V8DOMMap
This is achieved by cherry-picking WebKit patch http://trac.webkit.org/changeset/54218
Change-Id: I953939c9ee0a478c26f0481d923595325b67f718
Steve Block [Tue, 2 Feb 2010 18:47:02 +0000 (18:47 +0000)]
Merge webkit.org at r54127 : Implement new overload of GraphicsContext::drawFocusRing on Android
See http://trac.webkit.org/changeset/53857
Change-Id: I9e8f980ef8ecccd206d56b73d5834dab74a96ee8
Steve Block [Tue, 2 Feb 2010 18:46:44 +0000 (18:46 +0000)]
Merge webkit.org at r54127 : mainWorldScriptState is now a global function.
See http://trac.webkit.org/changeset/54051
Change-Id: I1f904a812dab1acf3eafd4c287571df245d4fa0d
Steve Block [Tue, 2 Feb 2010 18:46:10 +0000 (18:46 +0000)]
Merge webkit.org at r54127 : GIFImageDecoder now requires ImageDecoder.
ImageDecoder requires numerous additional include paths.
Change-Id: I047d36db7b5f28e7602f55eeeedc04beb713c079
Steve Block [Tue, 2 Feb 2010 18:39:30 +0000 (18:39 +0000)]
Merge webkit.org at r54127 : Fix some WebKit includes
Change-Id: Ibcdef84d6e49c7e4a725ac1d22ae59a165418280
Steve Block [Tue, 2 Feb 2010 18:38:55 +0000 (18:38 +0000)]
Merge webkit.org at r54127 : Make FLATTEN_IFRAME method overrides protected
RenderPartObject inherits calcWidth/calcHeight as public methods throught the
chain RenderPart -> RenderWidget -> RenderReplaced -> RenderBox.
On Android, RenderPartObject overrides calcWidth/calcHeight as private methods
for FLATTEN_IFRAME. This is not yet upstreamed.
The new WebKit uses calcWidth/calcHeight from RenderEmbeddedObject, which
inherits from RenderPartObject. So we need to make the these methods protected
in RenderPartObject
Change-Id: Ifb48d5daa10fc14c80f6da987cbd034713febc12
Steve Block [Tue, 2 Feb 2010 18:38:22 +0000 (18:38 +0000)]
Merge webkit.org at r54127 : Update GraphicsContext::drawFocusRing to reflect refactoring
See http://trac.webkit.org/changeset/52632
Change-Id: I4bb5569de809169a9d170328ef1671a66a45929c
Steve Block [Tue, 2 Feb 2010 18:38:11 +0000 (18:38 +0000)]
Merge webkit.org at r54127 : Fix Makefiles
Note that we update the XCode project file to add the new
GeolocationPositionCache files to allow us to build Android WebKit on Mac.
Change-Id: Iab5f73da50b0457cf6212d0aa1a8f6a413027f50
Steve Block [Wed, 3 Feb 2010 19:30:45 +0000 (19:30 +0000)]
Merge webkit.org at r54127 : Fix conflicts due to V8 feature runtime enabler flags
These have been modified to default to true on Android.
We also set the new flags to default to true.
Note that the enabler flag for database has changed.
See http://trac.webkit.org/changeset/53595
Change-Id: I2832c4bcb316f481a33a8c00e7fe90dffa8dcdcf
Steve Block [Tue, 2 Feb 2010 18:33:51 +0000 (18:33 +0000)]
Merge webkit.org at r54127 : Fix conflict with addition of virtual destructor to Visitor class
Android had added a virtual destructor to DOMWrapperMap::Vistor
See https://android-git.corp.google.com/g/#change,21263
DOMWrapperMap::Vistor was removed and WeakReferenceMap::Visitor was added in
http://trac.webkit.org/changeset/51998
DOMWrapperMap inherits from WeakReferenceMap.
The virtual desctructor was upstreamed to webkit.org for WeakReferenceMap::Visitor in
http://trac.webkit.org/changeset/53401
Note that the message in the ChangeLog is incorrect.
Change-Id: Ia801155d0b42100e91b891b0568486fc76d037e1
Steve Block [Wed, 3 Feb 2010 19:28:15 +0000 (19:28 +0000)]
Merge webkit.org at r54127 : Fix conflicts with Android addition of touch event time
This is not yet upstreamed, so we keep ours.
See https://android-git.corp.google.com/g/#change,39424
Change-Id: I65233af30227b7dd84a1c2b29e5dfc6da20e905e
Steve Block [Tue, 2 Feb 2010 18:32:28 +0000 (18:32 +0000)]
Merge webkit.org at r54127 : Fix final trivial merges
Change-Id: Ib24c66a3c609fd1c8ae9697f471a8abc85e5aa33
Steve Block [Tue, 2 Feb 2010 18:31:56 +0000 (18:31 +0000)]
Merge webkit.org at r54127 : Fix conflicts in touchevents IDL files as GenerateConstructor is no longer required
See http://trac.webkit.org/changeset/52537
Change-Id: Id985ac707e30ce100dd06d8e57826af6184c10e6
Steve Block [Tue, 2 Feb 2010 18:31:32 +0000 (18:31 +0000)]
Merge webkit.org at r54127 : Fix merge conflict in break_lines.cpp
See http://trac.webkit.org/changeset/53839
Change-Id: I123e8296c4b6bcfa4abd70ef67f9db14275bdf4c
Steve Block [Wed, 3 Feb 2010 19:21:02 +0000 (19:21 +0000)]
Merge webkit.org at r54127 : Merge conflicts due to longpress and doubletap touchevents
Keep ours as this code has not yet been upstreamed.
Change-Id: Ia05ab6c8c36b2d332fec2fe4c16ceacff2933382
Steve Block [Tue, 2 Feb 2010 18:27:44 +0000 (18:27 +0000)]
Merge webkit.org at r54127 : Resolve conflicts for handleTouchEvent
On Android, handleTouchEvent returns int, rather than bool.
Change-Id: I8ba16342eac7ccca1c7df3fa36b52ca8192a69b5
Steve Block [Tue, 2 Feb 2010 18:27:20 +0000 (18:27 +0000)]
Merge webkit.org at r54127 : Resolve conflicts in V8 touch events bindings.
The V8 touch event bindings weren't upstreamed, but this code has now all been deleted in favour of auto-generation.
See http://trac.webkit.org/changeset/52663 for the change that removes the indexed getters used for touch events
Change-Id: Ie59c504d7efcb408c18f76d085db63bc1c4a96c4
Steve Block [Tue, 2 Feb 2010 18:26:56 +0000 (18:26 +0000)]
Merge webkit.org at r54127 : Resolve conflicts due to code being moved from V8Proxy.cpp to V8DOMWindowShell.cpp
This caused conflicts with Android instrumentation additions
See http://trac.webkit.org/changeset/52666
Change-Id: I3b24bb00a00d7e02705bac7fc87c99fb9ba89478
Steve Block [Tue, 2 Feb 2010 18:26:23 +0000 (18:26 +0000)]
Merge webkit.org at r54127 : Fix conflict in V8DocumentCustom.cpp
The whole method is now guarded in IDL.
See http://trac.webkit.org/changeset/53271
Change-Id: If319bcc542bd042c63fb060cac473de2dcbed81a
Steve Block [Tue, 2 Feb 2010 18:26:06 +0000 (18:26 +0000)]
Merge webkit.org at r54127 : Fix conflict in FrameLoader.cpp due to Android ARCHIVE
See http://trac.webkit.org/changeset/52314
Change-Id: Ic6d1b8164ebe646450d5866882e1b692e3076060
Steve Block [Tue, 2 Feb 2010 18:25:42 +0000 (18:25 +0000)]
Merge webkit.org at r54127 : Fix conflict in CachedImage.cpp due to ANDROID_BLOCK_NETWORK_IMAGE
See http://trac.webkit.org/changeset/52177
Change-Id: I0c9e64766c6d7c9479100fb5b313b4562c5e7e42
Steve Block [Tue, 2 Feb 2010 18:24:37 +0000 (18:24 +0000)]
Merge webkit.org at r54127 : Update RenderLayerCompositor.cpp to account for syntax change.
See http://trac.webkit.org/changeset/53110
Change-Id: Ib82ce428fc761a2791a7ce1fc0de486b6903a43a
Steve Block [Tue, 2 Feb 2010 18:24:12 +0000 (18:24 +0000)]
Merge webkit.org at r54127 : Network type access has not yet been upstreamed
Have marked these additions with TODOs until upstreamed.
See https://android-git.corp.google.com/g/#change,37402
Change-Id: I0cae1865546797bd17dc76d0c1517f065cae32b1
Steve Block [Tue, 2 Feb 2010 18:23:55 +0000 (18:23 +0000)]
Merge webkit.org at r54127 : Merge with additional comment in SharedBuffer.cpp
See http://trac.webkit.org/changeset/52795
Change-Id: I0ba4c6499090fa1405ab7bc50b90f278f76e916f
Steve Block [Tue, 2 Feb 2010 18:23:32 +0000 (18:23 +0000)]
Merge webkit.org at r54127 : Take theirs for refactoring in Node.cpp
This isn't a genuine conflict.
It looks like git got confused due to changes made to Android for touch events.
See https://android-git.corp.google.com/g/#change,38141 and http://trac.webkit.org/changeset/53564
Change-Id: I8f45a2be90f10b3718ea977430d3bfa65433c373
Steve Block [Tue, 2 Feb 2010 18:23:15 +0000 (18:23 +0000)]
Merge webkit.org at r54127 : Merge in Node.cpp due to Android instrumentation
See http://trac.webkit.org/changeset/52341
Change-Id: I0aa44a36bea6f04f2fd1c91907339f6630321132
Steve Block [Tue, 2 Feb 2010 18:22:59 +0000 (18:22 +0000)]
Merge webkit.org at r54127 : Keep ours for PlatformBridge.
Change-Id: I19c5c5ea530813b6665c0d4beacae94be9d65d5d
Steve Block [Tue, 2 Feb 2010 18:22:31 +0000 (18:22 +0000)]
Merge webkit.org at r54127 : Take theirs for extra layout delay.
See http://trac.webkit.org/changeset/52919 and http://trac.webkit.org/changeset/53027
Change-Id: I0a5d442520651184b23ac30cf78b3c0d220c619b
Steve Block [Tue, 2 Feb 2010 18:22:07 +0000 (18:22 +0000)]
Merge webkit.org at r54127 : Fix conflicts due to use of OS_ANDROID
See http://trac.webkit.org/changeset/52791
Change-Id: I0e1a6ae16f93cdbb12ae5770607a220079451cb8
Steve Block [Tue, 2 Feb 2010 18:21:35 +0000 (18:21 +0000)]
Merge webkit.org at r54127 : Take theirs for changes to JavaScript string addition.
The conflict is due to the fact that we cherry-picked a WebKit change
http://trac.webkit.org/changeset/51978 to fix a bug.
This change updates all files touched by this change to match webkit.org.
See https://android-git.corp.google.com/g/#change,36411
Change-Id: Ie17c59467b74f3bf3be1149bebe086b92b30afc4
Steve Block [Tue, 2 Feb 2010 18:21:08 +0000 (18:21 +0000)]
Merge webkit.org at r54127 : Resolve Geolocation conflicts.
Keep ours for maximumAge code.
Take theirs for client-based Geolocation code.
Change-Id: I72baa0026b1cd1bec617843a992dfb6008ca774d
Steve Block [Tue, 2 Feb 2010 18:17:00 +0000 (18:17 +0000)]
Merge webkit.org at r54127 : Resolve conflicts in WebCore/bridge
Keep ours for generic bridge code as this is a work in progress.
Take theirs for conflicts on other platforms due to bridge changes.
Take theirs for updates for recently moved JSC JNI bridge.
Change-Id: I7db68450a369bb652755cc4b9555083c76b07510
Steve Block [Tue, 2 Feb 2010 18:16:40 +0000 (18:16 +0000)]
Merge webkit.org at r54127 : Take theirs for ChangeLogs and build files for other platforms.
Change-Id: Ie4d7a2183c45d7dbfe2e49692ac573eea243360e
Steve Block [Tue, 2 Feb 2010 18:10:48 +0000 (18:10 +0000)]
Merge webkit.org at r54127 : Keep ours for Makefiles.
Change-Id: I120600c8aa2f52cb5b0c69181477863c61f87a11
Steve Block [Tue, 2 Feb 2010 14:57:50 +0000 (14:57 +0000)]
Merge webkit.org at r54127 : Initial merge by git
Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
Steve Block [Thu, 4 Feb 2010 14:55:40 +0000 (06:55 -0800)]
Merge "Renames a variable in AddJavascriptInterface which shadows a parameter of the same name"
Steve Block [Thu, 4 Feb 2010 14:54:49 +0000 (06:54 -0800)]
Merge "Fix a bug when converting double and float types from NP variants to JNI types on V8"
Steve Block [Thu, 4 Feb 2010 11:32:41 +0000 (11:32 +0000)]
Renames a variable in AddJavascriptInterface which shadows a parameter of the same name
Change-Id: I9600c489090def7f4ec6e1e66f8db68ed6551c80
Steve Block [Thu, 4 Feb 2010 14:45:08 +0000 (14:45 +0000)]
Fix a bug when converting double and float types from NP variants to JNI types on V8
This bug has been present since the code was first added in V8Bindings/jni/jni_utility.cpp.
https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=
7fa30a60f66c19c8e6fb91ef799bca4d8d6f57f2
Change-Id: I4cc74369880d42e6610c2959f2d8bef2b7712927
Ben Murdoch [Thu, 28 Jan 2010 14:47:28 +0000 (14:47 +0000)]
Forward the console message level from WebCore to Java land.
This change requires a change to frameworks/base to receive the extra information.
BUG=
2401755
Change-Id: I27b1059dbc24ad2687e8ef0223599b0efcd74eca
Steve Block [Wed, 3 Feb 2010 18:23:54 +0000 (18:23 +0000)]
Enable database and appcache for V8
These have been disabled due to the new runtime feature enabler flags in the V8 bindings.
See http://trac.webkit.org/changeset/49989 and http://trac.webkit.org/changeset/50534
Change-Id: I7fb78dcaa3235cd87af1aebed4d767e81dfc48e2
Grace Kloba [Wed, 3 Feb 2010 03:08:37 +0000 (19:08 -0800)]
Pass touch event time from Java to WebKit
merge from https://android-git.corp.google.com/g/#change,39356
Steve Block [Wed, 3 Feb 2010 13:22:54 +0000 (05:22 -0800)]
Merge "Guard the new Navigator connection property with a temporary ENABLE_CONNECTION guard until it is upstreamed."
Steve Block [Tue, 2 Feb 2010 23:37:57 +0000 (23:37 +0000)]
Guard the new Navigator connection property with a temporary ENABLE_CONNECTION guard until it is upstreamed.
This is required to build Android WebKit for Mac.
The guard will be removed once the connection property is upstreamed.
Change-Id: I874e832b80dc682a49cae4df1fc6970283909ef3
Steve Block [Wed, 3 Feb 2010 12:46:06 +0000 (04:46 -0800)]
Merge changes I83856763,Ib434e467
* changes:
Adds new GeolocationPositionCache files to XCode project
Fix XCode project to allow us to build Android WebKit on Mac
Steve Block [Wed, 3 Feb 2010 11:56:06 +0000 (11:56 +0000)]
Adds new GeolocationPositionCache files to XCode project
This is required to build Android WebKit on Mac.
See https://android-git.corp.google.com/g/#change,38319
Change-Id: I838567637b55aeed4d7b77e382ec6c8cffdb9e47
Steve Block [Wed, 3 Feb 2010 12:03:48 +0000 (12:03 +0000)]
Fix XCode project to allow us to build Android WebKit on Mac
Recent cherry-picks of WebKit patches were merged incorrectly into the XCode project file.
This change fixes those bad merges.
The relevant changes are ...
JavaInstance - http://trac.webkit.org/changeset/53412 - https://android-git.corp.google.com/g/#change,37667
JavaClass - http://trac.webkit.org/changeset/53443 - https://android-git.corp.google.com/g/#change,37669
JavaStringJSC - http://trac.webkit.org/changeset/53449 - https://android-git.corp.google.com/g/#change,37687
Bridge - http://trac.webkit.org/changeset/53464 - https://android-git.corp.google.com/g/#change,37680
JNIUtility - http://trac.webkit.org/changeset/53497 - https://android-git.corp.google.com/g/#change,37815
JNIBridge - http://trac.webkit.org/changeset/53557 - https://android-git.corp.google.com/g/#change,37961
JNIBridgeJSC - http://trac.webkit.org/changeset/53849 - https://android-git.corp.google.com/g/#change,38446
BridgeJSC - http://trac.webkit.org/changeset/53620 - https://android-git.corp.google.com/g/#change,37963
Change-Id: Ib434e467c8569781a8acbf1c9e7714946d6e4887
Ben Murdoch [Wed, 3 Feb 2010 11:21:01 +0000 (11:21 +0000)]
resolved conflicts for merge of
a82364c2 to master
This is in conjunction with the frameworks/base rollback: Id1404fb056b033ebd60529dd326ec9a3c32f94b0
The intent of these two changes is to avoid auto merging from MR2.
Change-Id: Idb5ba06a813fc547ebb45c6d251971a51cff3f0d
Grace Kloba [Wed, 3 Feb 2010 05:07:13 +0000 (21:07 -0800)]
am
5b9b4d4e: Pass touch event time from Java to WebKit
Merge commit '
5b9b4d4efe739cfa2aa117372879c5c37443e644' into eclair-mr2-plus-aosp
* commit '
5b9b4d4efe739cfa2aa117372879c5c37443e644':
Pass touch event time from Java to WebKit
Grace Kloba [Wed, 3 Feb 2010 03:08:37 +0000 (19:08 -0800)]
Pass touch event time from Java to WebKit
Steve Block [Tue, 2 Feb 2010 16:24:03 +0000 (08:24 -0800)]
Merge "Update V8 JNI bridge code to match final version submitted to webkit.org"
Steve Block [Fri, 29 Jan 2010 11:33:49 +0000 (11:33 +0000)]
Update V8 JNI bridge code to match final version submitted to webkit.org
No functional changes, style changes only
See the following WebKit changes ...
JavaStringV8 : http://trac.webkit.org/changeset/54132
JavaInstanceV8 : http://trac.webkit.org/changeset/54165
JavaClassV8 : http://trac.webkit.org/changeset/54169
JNIUtilityPrivate : http://trac.webkit.org/changeset/54171
JNIBridgeV8 : http://trac.webkit.org/changeset/54175
JavaNPObjectV8 : http://trac.webkit.org/changeset/54237
Change-Id: I7cc9d19e74043d1bac1a576cdc97a780fe317b5d
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."
Andrei Popescu [Mon, 1 Feb 2010 22:02:39 +0000 (22:02 +0000)]
Implement V8 counter support
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
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
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
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
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
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
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
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
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
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."
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
The Android Open Source Project [Fri, 29 Jan 2010 22:08:57 +0000 (14:08 -0800)]
reconcile android-2.1_r1 snapshot
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."
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
Steve Block [Fri, 29 Jan 2010 17:18:57 +0000 (09:18 -0800)]
Merge "Fix 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
Steve Block [Thu, 28 Jan 2010 12:43:39 +0000 (04:43 -0800)]
Merge "Changes to make Bridge.h script-engine independent are complete"
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.
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."
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
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
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
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
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
Steve Block [Wed, 27 Jan 2010 15:10:56 +0000 (07:10 -0800)]
Merge "Fixes Geolocation maximumAge implementation to work when requestPermission is synchronous"
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
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
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
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
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"
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
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."
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
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.
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
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.
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
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
Steve Block [Tue, 26 Jan 2010 16:33:05 +0000 (08:33 -0800)]
Merge "Moves the Geolocation position cache out of the Geolocation object."