summaryrefslogtreecommitdiffstats
path: root/WebKit
Commit message (Collapse)AuthorAgeFilesLines
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-04374-3021/+40689
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Merge "Renames a variable in AddJavascriptInterface which shadows a ↵Steve Block2010-02-041-3/+3
|\ | | | | | | parameter of the same name"
| * Renames a variable in AddJavascriptInterface which shadows a parameter of ↵Steve Block2010-02-041-3/+3
| | | | | | | | | | | | the same name Change-Id: I9600c489090def7f4ec6e1e66f8db68ed6551c80
* | Forward the console message level from WebCore to Java land.Ben Murdoch2010-02-043-6/+6
|/ | | | | | | | This change requires a change to frameworks/base to receive the extra information. BUG=2401755 Change-Id: I27b1059dbc24ad2687e8ef0223599b0efcd74eca
* Pass touch event time from Java to WebKitGrace Kloba2010-02-035-6/+16
| | | merge from https://android-git.corp.google.com/g/#change,39356
* Implement V8 counter supportAndrei Popescu2010-02-025-0/+206
|
* Merge "Anchor the page at top left corner when webView size changed."Shimeng (Simon) Wang2010-01-291-35/+17
|\
| * Anchor the page at top left corner when webView size changed.Shimeng (Simon) Wang2010-01-291-35/+17
| | | | | | | | | | Bug: 2356891 modified: WebKit/android/jni/WebViewCore.cpp
* | Add request header support for the Browser/WebView.Grace Kloba2010-01-271-2/+41
|/ | | | | | | | | | | | | | 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.
* Stop forwarding touch events from Java when the top level document is ↵Ben Murdoch2010-01-275-31/+19
| | | | | | | | | | | 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
* Fix memory leak with layers.Nicolas Roard2010-01-261-5/+2
| | | | | | | | | | | | | | | 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.
* Fix potential crash with layers enabled.Nicolas Roard2010-01-261-1/+3
| | | | | | See bug http://b/2395197 We remove the AndroidAnimationTimer class, and use a callback mechanism instead in GraphicsLayerAndroid.
* Merge "Moves the Geolocation position cache out of the Geolocation object."Steve Block2010-01-261-2/+2
|\
| * Moves the Geolocation position cache out of the Geolocation object.Steve Block2010-01-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | am 562a8a46: am 53c84f3c: Do not allow the plugin to show or hide the ↵Derek Sollenberger2010-01-253-7/+22
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | Do not allow the plugin to show or hide the keyboard unless it has focus.Derek Sollenberger2010-01-253-7/+22
| | |
* | | am 71ce050b: am c45f962c: Merge "Correcting how the plugin\'s bounding ↵Derek Sollenberger2010-01-253-73/+86
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | coordinates are computed." into eclair-mr2 Merge commit '71ce050b9dbf42b1f1f33269021af49371c20a54' * commit '71ce050b9dbf42b1f1f33269021af49371c20a54': Correcting how the plugin's bounding coordinates are computed.
| * Correcting how the plugin's bounding coordinates are computed.Derek Sollenberger2010-01-253-73/+86
| |
* | allow text node boundaries to delimit addressesCary Clark2010-01-251-1/+3
| | | | | | | | | | | | | | | | | | 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
* | Merge "Merge pinch zoom from Eclair to Master. Including,"Grace Kloba2010-01-252-29/+89
|\ \
| * | Merge pinch zoom from Eclair to Master. Including,Grace Kloba2010-01-232-29/+89
| | | | | | | | | | | | | | | | | | commit 237bd75b6ebc1298cbd1c46b43903d19d7dd18b1 commit dbb3061334333f32b6f12c294a551bd2a4a3844c commit f48712a096831a3b85a5e18dabd44a541f6b4712 commit b99dd716b4af0afde074e28b50b7b28ae3c03da7
* | | am 53e1af87: am 2eb76d0b: Add logging for all plugin events and their return ↵Derek Sollenberger2010-01-255-21/+162
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | values. Merge commit '53e1af87fa4f19eac50b3d6fb45a3a386d156cd0' * commit '53e1af87fa4f19eac50b3d6fb45a3a386d156cd0': Add logging for all plugin events and their return values.
| * | Add logging for all plugin events and their return values.Derek Sollenberger2010-01-255-21/+162
| | |
* | | Fix build byAndrei Popescu2010-01-251-0/+4
| | | | | | | | | | | | | | | - 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.
* | | Prepare NPV8Object.h/cpp for upstreaming:Andrei Popescu2010-01-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | Merge "Prepare ScriptController class for upstreaming."Andrei Popescu2010-01-251-0/+11
|\ \ \
| * | | Prepare ScriptController class for upstreaming.Andrei Popescu2010-01-221-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Call nextTextfield on the CachedFrame that contains the cursor/focus.Leon Scroggins2010-01-221-3/+5
| | | | | | | | | | | | | | | | Fixes http://b/issue?id=2359748
* | | | am de7e9124: am ec4b5ee4: As we are sharing the view between embedded and ↵Grace Kloba2010-01-211-11/+10
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | | | | | | | | | | | | 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
| * | As we are sharing the view between embedded and fullGrace Kloba2010-01-211-11/+10
| | | | | | | | | | | | | | | | | | screen, we should make sure to call the correct update when bounds changed. This should fix the crash when changing orientation.
* | | Merge changes I1b4ba984,I6cadc4f4,Icf99c709,Id22d59b7,I63f3c4edSteve Block2010-01-211-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | Move V8 jni_npobject to bridge/jni/v8/JavaNPObjectV8 and fix styleSteve Block2010-01-211-1/+1
| | | | | | | | | | | | | | | | Change-Id: Icf99c709929ef14551de61e55780b97767575f01
| * | | Move V8 jni_instance to bridge/jni/v8/JavaInstanceV8 and fix styleSteve Block2010-01-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Refactor style of Android specific touch events code in preparation for ↵Ben Murdoch2010-01-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | upstreaming to webkit.org. Change-Id: Id34e727145fe94e98e62a36b7fc8256468b4157c
* | | | am 67c90537: am 72acb46d: Fix the crash of exiting full screen by checking null.Grace Kloba2010-01-202-2/+4
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Merge commit '67c90537fc70147ad8943f0a2cd02def405bcf8f' * commit '67c90537fc70147ad8943f0a2cd02def405bcf8f': Fix the crash of exiting full screen by checking null.
| * | | Fix the crash of exiting full screen by checking null.Grace Kloba2010-01-202-2/+4
| | | | | | | | | | | | | | | | | | | | When we exit full screen, we place the embedded view on the screen, so we need to destroy it again in the destructor
* | | | resolved conflicts for merge of 9dabd572 to masterGrace Kloba2010-01-203-76/+30
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Changing plugin setwindow() to use page coordinateGrace Kloba2010-01-203-76/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of frame as it is what Flash expects. For other port like Mac, it passes the window coordinate to the plugin. In Android, plugin always sees the full page and we use the visible screen rect to indicate whether it is visible. Change to use page coordinate across PluginView and PluginWidget for consistency. This should fix the problem Ben saw with plugin inside iframe (which is caused by a race condition) and the cnnn ad problem Adobe has.
* | | Cherry-pick WebKit change 53497 to rename jni_utility and ↵Steve Block2010-01-2018-72/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jni_utility_private to JNIUtility and JNIUtilityPrivate See http://trac.webkit.org/changeset/53497 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. This change required updating headers in Android-specific files in WebCore and WebKit. Change-Id: I4b80eb3eadcff66cbd261aa6ccef0f37927250b1
* | | resolved conflicts for merge of 3f4b1969 to masterSteve Block2010-01-204-2/+20
|\ \ \ | |/ / | | | | | | Change-Id: I24c41d6ab08dd3594edd4ff62a1c823c904b9851
| * | Merge changes I61cfea19,Ib2fe7793 into eclair-mr2Steve Block2010-01-204-2/+20
| |\ \ | | | | | | | | | | | | | | | | | | | | * changes: Cherry-pick WebKit change 53449 to move JSC-specific implementation of JavaString to a private implementation class Cherry-pick WebKit change 53464 to rename WebCore/bridge/runtime to WebCore/bridge/Bridge
| | * | Cherry-pick WebKit change 53464 to rename WebCore/bridge/runtime to ↵Steve Block2010-01-194-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebCore/bridge/Bridge See http://trac.webkit.org/changeset/53464 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. Note that this change required an update to ScriptControllerAndroid.cpp and a manual fix in PluginView.cpp to add a temporary ANDROID guard. Change-Id: Ib2fe7793f7b3212e3b41324ff7dc5bb15c0e14b4
* | | | Refactor our touch event code to use the version submitted to webkit.org by ↵Ben Murdoch2010-01-205-17/+82
| | | | | | | | | | | | | | | | | | | | | | | | the Qt team. Change-Id: I2953472cee68aadf18f9dd740e9b3f69ad729cf0
* | | | am 2ba2794f: am 4d667d7f: Exit the fullscreen mode when the PluginWidget is ↵Grace Kloba2010-01-192-1/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | destroyed. Merge commit '2ba2794f78c094c88827bafc31f42afefe710d1e' * commit '2ba2794f78c094c88827bafc31f42afefe710d1e': Exit the fullscreen mode when the PluginWidget is
| * | | Exit the fullscreen mode when the PluginWidget isGrace Kloba2010-01-192-1/+9
| |/ / | | | | | | destroyed.
* | | resolved conflicts for merge of acf4a21d to masterSteve Block2010-01-191-9/+9
|\ \ \ | |/ / | | | | | | Change-Id: If8bb4335848f51919608d28a30ee610acb120ae7
| * | Cherry-pick WebKit change 53436 to fix style in JavaInstanceJSCSteve Block2010-01-191-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/53436 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. Note that changes to the following were required as a result of this cherry-pick. - WebCoreFrameBridge.cpp - updated to use JavaInstance::m_instance - V8Binding/jni/jni_instance - Updated to rename the V8 version of JavaInstance::_instance to JavaInstance::m_instance to allow the same code path to be used in WebCoreFrameBridge. Change-Id: I6884f7424c8a0917095f828bda4ca62452e527b5
* | | resolved conflicts for merge of df644d06 to masterSteve Block2010-01-191-1/+1
|\ \ \ | |/ / | | | | | | Change-Id: I02d6b5e94724091decfe0c26317554c86dcfb2da
| * | Merge "Cherry-pick WebKit change 53412 to move jni_instance to ↵Steve Block2010-01-191-1/+1
| |\ \ | | | | | | | | | | | | JavaInstanceJSC" into eclair-mr2
| | * | Cherry-pick WebKit change 53412 to move jni_instance to JavaInstanceJSCSteve Block2010-01-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/53412 Note that changes to WebCoreFrameBridge.cpp cpp were required as a result of this cherry-pick. Change-Id: I0a6f6fafc5b0d5d9337ef4e339c6a0c5dd188eb9