summaryrefslogtreecommitdiffstats
path: root/WebKit/android
Commit message (Collapse)AuthorAgeFilesLines
* 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-132-29/+66
|\ \ | |/ | | | | | | | | | | | | | | 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-132-29/+66
| | | | | | | | | | | | | | | | | | 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-123-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | |_|/ | | |/| |
* | | | | am 4843cf01: am 9fb6b3c3: Ensure that the current textfield is actually a ↵Leon Scroggins2010-01-121-2/+2
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | | | | | | | | | | | | | | | | textfield before treating it like one. Merge commit '4843cf010e538098e485802576b5a16d7f5cb5f1' * commit '4843cf010e538098e485802576b5a16d7f5cb5f1': Ensure that the current textfield is actually a textfield before treating it like one.
| * | | Ensure that the current textfield is actually a textfield before treating it ↵Leon Scroggins2010-01-121-2/+2
| |/ / | | | | | | | | | | | | | | | like one. Fix for http://b/issue?id=2368868
* | | Merge "Implement timeupdate events for video tag."Andrei Popescu2010-01-121-1/+18
|\ \ \
| * | | Implement timeupdate events for video tag.Andrei Popescu2010-01-121-1/+18
| | | | | | | | | | | | | | | | Fix http://b/issue?id=2210105
* | | | rebuild the nav cache if the clicked on node is invalidCary Clark2010-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, the slop parameter was set to zero if the node was invalid, and used to skip searching for the node. Now, the cache is rebuilt on the java side before the C side is called. requires a companion fix in frameworks/base fixes http://b/2362334
* | | | resolved conflicts for merge of ab89d1aa to masterDerek Sollenberger2010-01-115-77/+109
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | consolidating to only use one surface per plugin. give plugin access to java ↵Derek Sollenberger2010-01-115-108/+102
| | | | | | | | | | | | | | | | | | context. There is a companion commit in frameworks/base.
* | | resolved conflicts for merge of 9653e7ce to masterLeon Scroggins2010-01-117-43/+13
|\ \ \ | |/ /
| * | Bring up the IME after receiving a response from webkit.Leon Scroggins2010-01-117-48/+13
| | | | | | | | | | | | | | | | | | Fix for http://b/issue?id=2361658 Requires a change to frameworks/base.
* | | am 43342a27: am ee0e4a35: Merge "Updates the use of weak references in the ↵Steve Block2010-01-081-11/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | script-to-Java bridge for V8." into eclair-mr2 Merge commit '43342a276dcdb9e1f8c677f5077d151cd5d6ad07' * commit '43342a276dcdb9e1f8c677f5077d151cd5d6ad07': Updates the use of weak references in the script-to-Java bridge for V8.
| * | Merge "Updates the use of weak references in the script-to-Java bridge for ↵Steve Block2010-01-081-11/+20
| |\ \ | | | | | | | | | | | | V8." into eclair-mr2
| | * | Updates the use of weak references in the script-to-Java bridge for V8.Steve Block2010-01-081-11/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, V8 uses weak references to the Java object owned by JObjectWrapper. This is in contrast to JSC, which uses strong references in JObjectWrapper. However, for the special-case where JObjectWrapper is used in JavaInstance in WebCoreFrameBridge, JSC uses WeakJavaInstance to swap the strong references for weak references. This change updates the V8 version of JObjectWrapper to use strong references to match the JSC version. To maintain the weak reference behavior where JObjectWrapper is used in JavaInstance in WebCoreFrameBridge, V8 now make use of WeakJavaInstance too. This requires changes to jni_npobject to call the necessary methods on JavaInstance to swap the references when the object is accessed. Change-Id: I3724d7e6437588feb0268a2670b02a93b52e54f0
* | | | Fix a code ugliness issue: avoid using two variables named "size" inside the ↵Andrei Popescu2010-01-081-3/+3
| | | | | | | | | | | | | | | | same for loop.
* | | | am e44f974f: am 15f1e443: In motionUp, update the CachedHistory\'s mMouseBounds.Leon Scroggins2010-01-071-1/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'e44f974f1d7e25a2823901e0f34c04aa924b7527' * commit 'e44f974f1d7e25a2823901e0f34c04aa924b7527': In motionUp, update the CachedHistory's mMouseBounds.
| * | | In motionUp, update the CachedHistory's mMouseBounds.Leon Scroggins2010-01-071-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | mMouseBounds is later used to determine the point of clicking. Fixes http://b/issue?id=2313991
* | | | am 6864ec3c: am 1ccac4c1: remove unused jni interfacesCary Clark2010-01-071-8/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '6864ec3c0bb8b5cc0dfa126546419113e946661a' * commit '6864ec3c0bb8b5cc0dfa126546419113e946661a': remove unused jni interfaces
| * | | remove unused jni interfacesCary Clark2010-01-071-8/+0
| | | | | | | | | | | | | | | | companion change is in frameworks/base
* | | | resolved conflicts for merge of 174cd118 to masterLeon Scroggins2010-01-076-38/+28
|\ \ \ \ | |/ / /
| * | | Request <label> info only when accessing a textfield.Leon Scroggins2010-01-076-39/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we were storing the label info each time we build the navigation cache. Requires a change to frameworks/base.
* | | | am f0c18f75: am e5e9720d: In findBestHitAt, set x and y to the intersection ↵Leon Scroggins2010-01-063-30/+24
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | of slop and cursor. Merge commit 'f0c18f75640006d930c0b2ea95422c3fdafedfdc' * commit 'f0c18f75640006d930c0b2ea95422c3fdafedfdc': In findBestHitAt, set x and y to the intersection of slop and cursor.
| * | | In findBestHitAt, set x and y to the intersection of slop and cursor.Leon Scroggins2010-01-063-30/+24
| | | | | | | | | | | | | | | | Fixes http://b/issue?id=2201866
* | | | am 3146e9ee: am 62d9c8e5: Store label information to be used for hint text.Leon Scroggins2010-01-064-6/+49
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '3146e9ee4d8f6114a97ceb01d6fd54db77d99538' * commit '3146e9ee4d8f6114a97ceb01d6fd54db77d99538': Store label information to be used for hint text.
| * | | Store label information to be used for hint text.Leon Scroggins2010-01-064-6/+49
| | | | | | | | | | | | | | | | | | | | | | | | Fix for http://b/issue?id=2331526 Requires a change to frameworks/base.
| * | | webkit layers supportNicolas Roard2010-01-046-4/+252
| | | |
* | | | extract selected text from the pictureCary Clark2010-01-055-230/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The deleted code extracted the selected text from the WebKit DOM by looking for text in the render tree that matched the selection region. This has never worked well. The replacement approach matches the glyphs in the picture instead. - WebViewCore.* Remove getSelection() and supporting routines. Part of the deleted code looked for punctuation between segments to add space characters that might not be present in the markup. There's no equivalent in the replacement code; it uses spacial gaps to detect the need to add extra spaces. - SelectText.* Match the text to the selected region and convert the glyph to unicode. The tricky part is that spaces need to be inserted into the string when there are gaps in the text. - WebView.cpp Return the selection as a string to the java caller instead of a region. To convert the glyphs into text, a companion change was made to external/skia. To update the UI thread/webkit thread messaging, a companion change was also made to frameworks/base. Fixes http://b/2166748
* | | | resolved conflicts for merge of 870689c8Nicolas Roard2010-01-046-3/+251
| | | |
* | | | resolved conflicts for merge of 66367cf8 to masterLeon Scroggins2010-01-043-26/+41
|\ \ \ \ | |/ / /