summaryrefslogtreecommitdiffstats
path: root/WebKit
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | Change LOGE to LOGV.Patrick Scott2010-01-191-1/+1
| | |
* | | am 9611825c: am 6a5a35ed: Merge "Should check the enable plugin settings ↵Grace Kloba2010-01-191-1/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | before accepting the plugin mimetypes." into eclair-mr2 Merge commit '9611825c90fe01b75193ac4163b022178404e1f3' * commit '9611825c90fe01b75193ac4163b022178404e1f3': Should check the enable plugin settings before accepting
| * | Should check the enable plugin settings before acceptingGrace Kloba2010-01-181-1/+4
| | | | | | | | | the plugin mimetypes.
* | | Cherry-pick WebKit change 52103 - Add a client based Geolocation providerSteve Block2010-01-1812-7/+94
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Add navigator.networkType to allow apps to detect the connection type.Andrei Popescu2010-01-151-0/+29
| | | | | | | | | | | | | | | | | | The online event is fired when the networkType changes. Bug: 2368650
* | | am 8a2903f5: am b8a54826: Don\'t use static jclass unless we hold a reference.Grace Kloba2010-01-141-14/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '8a2903f5d11d14c8cb827d22a0a877a6e3507906' * commit '8a2903f5d11d14c8cb827d22a0a877a6e3507906': Don't use static jclass unless we hold a reference.
| * | Don't use static jclass unless we hold a reference.Grace Kloba2010-01-141-14/+9
| | | | | | | | | Fix the crash.
* | | am 93f808ab: am 388e461f: Add proper support for fixed position elementsNicolas Roard2010-01-141-3/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '93f808abccaf6f09c5c0226c01942c3be445031a' * commit '93f808abccaf6f09c5c0226c01942c3be445031a': Add proper support for fixed position elements
| * | Add proper support for fixed position elementsNicolas Roard2010-01-141-3/+4
| | | | | | | | | | | | | | | | | | | | | 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
* | | am e4771f1b: am 6916255e: Call into MimeTypeMap to get the mime type for an ↵Patrick Scott2010-01-133-29/+67
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | extension. Merge commit 'e4771f1b95589eff8479702dfbf5ef03c267c5c3' * commit 'e4771f1b95589eff8479702dfbf5ef03c267c5c3': Call into MimeTypeMap to get the mime type for an extension.
| * | Call into MimeTypeMap to get the mime type for an extension.Patrick Scott2010-01-133-29/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | clip the cursor rings if occludedCary Clark2010-01-131-4/+6
| | | | | | | | | | | | | | | | | | | | | 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
* | | am ddd2f469: am ab9c9800: Merge "Compare Node pointers rather than ↵Leon Scroggins2010-01-121-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | CachedNode pointers." into eclair-mr2 Merge commit 'ddd2f469835ed5402cb3edfa6c2865536011fbab' * commit 'ddd2f469835ed5402cb3edfa6c2865536011fbab': Compare Node pointers rather than CachedNode pointers.
| * | Merge "Compare Node pointers rather than CachedNode pointers." into eclair-mr2Leon Scroggins2010-01-121-2/+2
| |\ \
| | * | Compare Node pointers rather than CachedNode pointers.Leon Scroggins2010-01-121-2/+2
| | | | | | | | | | | | | | | | Fixes http://b/issue?id=2369028
* | | | Merge "resolved conflicts for merge of e0286f66 to master"Steve Block2010-01-123-0/+14
|\ \ \ \
| * \ \ \ resolved conflicts for merge of e0286f66 to masterSteve Block2010-01-123-0/+14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I6efcacf082170506048d0a2caf3d669796fc4253
| | * | | | When starting the Geolocation service provider, check that the WebView is ↵Steve Block2010-01-124-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | First draft of multitouch in the WebView.Grace Kloba2010-01-082-21/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | DO NOT MERGE.Grace Kloba2009-12-044-81/+372
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is cherry picked from https://android-git.corp.google.com/g/#change,28737 Fix http://b/issue?id=2304741 Add check null of getRealObject(). When a WebView is removed, there is a slight chance that getRealObject() for WebView's JavaObject be null. Fix http://b/issue?id=2159815
| | * | | | Merge change I43c19e84 into eclairAndroid (Google) Code Review2009-11-091-0/+17
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Stop Geolocation service when browser tab is in the background. Do not merge.
| | | * | | | Stop Geolocation service when browser tab is in the background. Do not merge.Steve Block2009-11-091-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a fix for bug http://b/issue?id=2211437 This has already been submitted to Eclair MR2 branch. Change-Id: I43c19e84fda6291590ff2f07bbadb18a4f86df5f
| | * | | | | do not merge -- Fix a clicking bug.Leon Scroggins2009-11-091-9/+0
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | original at https://android-git.corp.google.com/g/#change,31300 Remove some code that simulates a mouse click at the beginning of a textarea and the end of a textfield. The original goal was to make the click change the selection to be at the beginning or end of the field, respectively. However, we actually make another call which prevents this click from the selection. Further, the selection actually gets changed elsewhere. Fixes http://b/issue?id=2219233
| | * | | | do not merge: fix copy/paste using trackball on passionCary Clark2009-10-161-21/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix is alrady in mr2. It does not affect sholes -- this is a trackball only bug. The selection caret and arrow now take the scale factor and the height of the title bar into account when preparing the canvas for drawing. Also, simply call to CopyPaste::findClosest, and remove logic to attempt to pin the arrow to the current cursor. Requires a companion fix in framework/base Fixes http://b/issue?id=2187591
* | | | | | am 8752c4d3: am f8ffa7ae: Merge "adding event to notify the plugin when it ↵Derek Sollenberger2010-01-123-1/+23
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is on/off screen." into eclair-mr2 Merge commit '8752c4d3c7d623f1f6314e8b662d3626c849ca97' * commit '8752c4d3c7d623f1f6314e8b662d3626c849ca97': adding event to notify the plugin when it is on/off screen.
| * | | | | Merge "adding event to notify the plugin when it is on/off screen." into ↵Derek Sollenberger2010-01-123-1/+23
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | eclair-mr2
| | * | | | | adding event to notify the plugin when it is on/off screen.Derek Sollenberger2010-01-123-1/+23
| | | |_|/ / | | |/| | |