summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | Call into MimeTypeMap to get the mime type for an extension.Patrick Scott2010-01-134-36/+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 625ef54c: (-s ours) am dbb30613: DO NOT MERGE.Grace Kloba2010-01-120-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '625ef54c9e40168e824ee100fc6d3cb90c99b39f' * commit '625ef54c9e40168e824ee100fc6d3cb90c99b39f': DO NOT MERGE.
| * | | | | am dbb30613: DO NOT MERGE.Grace Kloba2010-01-121-1/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'dbb3061334333f32b6f12c294a551bd2a4a3844c' into eclair-plus-aosp * commit 'dbb3061334333f32b6f12c294a551bd2a4a3844c': DO NOT MERGE.
| | * | | | DO NOT MERGE.Grace Kloba2010-01-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check the dimensions against 0 before using it to calculate the ratio. Fix http://b/issue?id=2368862
* | | | | | 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.
| * | | | | am ab9c9800: Merge "Compare Node pointers rather than CachedNode pointers." ↵Leon Scroggins2010-01-121-2/+2
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eclair-mr2 Merge commit 'ab9c9800ae22385fd019e1f6a366fc5346d041aa' into eclair-mr2-plus-aosp * commit 'ab9c9800ae22385fd019e1f6a366fc5346d041aa': 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-125-2/+24
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ resolved conflicts for merge of e0286f66 to masterSteve Block2010-01-125-2/+24
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | Change-Id: I6efcacf082170506048d0a2caf3d669796fc4253
| | * | | | | | am 8ed98e2e: When starting the Geolocation service provider, check that the ↵Steve Block2010-01-126-2/+105
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebView is not already paused. Merge commit '8ed98e2e3f77020f7a43bbd5427bc3dd12ba5743' into eclair-plus-aosp * commit '8ed98e2e3f77020f7a43bbd5427bc3dd12ba5743': When starting the Geolocation service provider, check that the WebView is not already paused.
| | | * | | | | When starting the Geolocation service provider, check that the WebView is ↵Steve Block2010-01-126-2/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | 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.
| * | | | | | | am f8ffa7ae: Merge "adding event to notify the plugin when it is on/off ↵Derek Sollenberger2010-01-123-1/+23
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screen." into eclair-mr2 Merge commit 'f8ffa7aeb28d4325cdeb0d7bddcf9397d761f97f' into eclair-mr2-plus-aosp * commit 'f8ffa7aeb28d4325cdeb0d7bddcf9397d761f97f': 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.
| * | | | | | am 9fb6b3c3: Ensure that the current textfield is actually a textfield ↵Leon Scroggins2010-01-121-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before treating it like one. Merge commit '9fb6b3c382612e4284ca9bd38930ab94053b8888' into eclair-mr2-plus-aosp * commit '9fb6b3c382612e4284ca9bd38930ab94053b8888': 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-122-1/+20
|\ \ \ \ \ \
| * | | | | | Implement timeupdate events for video tag.Andrei Popescu2010-01-122-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix http://b/issue?id=2210105
* | | | | | | Merge "Cherry pick from Webkit for fix for ↵Ben Murdoch2010-01-121-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=31539."
| * | | | | | | Cherry pick from Webkit for fix for ↵Ben Murdoch2010-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=31539. Restore the default state of a textarea correctly. Change-Id: Id182817b7cd229e12676fd5ef55657ff6a963a4f
* | | | | | | | 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
* | | | | | | Merge "resolved conflicts for merge of ab89d1aa to master"Derek Sollenberger2010-01-116-78/+116
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ resolved conflicts for merge of ab89d1aa to masterDerek Sollenberger2010-01-116-78/+116
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | | |/ / / / /
| | * | | | | am 838afd1b: consolidating to only use one surface per plugin. give plugin ↵Derek Sollenberger2010-01-116-109/+109
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | access to java context. Merge commit '838afd1be683057ebaf5cf85359bf9a567602b7b' into eclair-mr2-plus-aosp * commit '838afd1be683057ebaf5cf85359bf9a567602b7b': consolidating to only use one surface per plugin. give plugin access to java context.
| | | * | | | consolidating to only use one surface per plugin. give plugin access to java ↵Derek Sollenberger2010-01-116-109/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | context. There is a companion commit in frameworks/base.
* | | | | | | am 4ad9c9b7: (-s ours) am 237bd75b: First draft of multitouch in the WebView.Grace Kloba2010-01-110-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | | | | | | | | | | | | | | Merge commit '4ad9c9b76f04defb3c0be94db5cf672322f53104' * commit '4ad9c9b76f04defb3c0be94db5cf672322f53104': First draft of multitouch in the WebView.
| * | | | | am 237bd75b: First draft of multitouch in the WebView.Grace Kloba2010-01-112-21/+73
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '237bd75b6ebc1298cbd1c46b43903d19d7dd18b1' into eclair-plus-aosp * commit '237bd75b6ebc1298cbd1c46b43903d19d7dd18b1': First draft of multitouch in the WebView.
| | * | | | 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
* | | | | | Merge "Update v8/bindings to remove the ANDROID #ifdefs and confirm that ↵Andrei Popescu2010-01-113-6/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | DOMData now officially has a virtual dtor."
| * | | | | | Update v8/bindings to remove the ANDROID #ifdefs and confirmAndrei Popescu2010-01-113-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that DOMData now officially has a virtual dtor. Changes upstreamed in https://bugs.webkit.org/show_bug.cgi?id=33390
* | | | | | | resolved conflicts for merge of 9653e7ce to masterLeon Scroggins2010-01-117-43/+13
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | am d485d47c: Bring up the IME after receiving a response from webkit.Leon Scroggins2010-01-117-48/+13
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd485d47cbb03ae8cbe9d96bc54a5cb83ee80570e' into eclair-mr2-plus-aosp * commit 'd485d47cbb03ae8cbe9d96bc54a5cb83ee80570e': Bring up the IME after receiving a response from webkit.
| | * | | | | 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-085-56/+56
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | am ee0e4a35: Merge "Updates the use of weak references in the script-to-Java ↵Steve Block2010-01-085-56/+56
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bridge for V8." into eclair-mr2 Merge commit 'ee0e4a35152a822ebac039808db1a4c33f02f7ee' into eclair-mr2-plus-aosp * commit 'ee0e4a35152a822ebac039808db1a4c33f02f7ee': 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-085-56/+56
| | |\ \ \ | | | | | | | | | | | | | | | | | | V8." into eclair-mr2
| | | * | | Updates the use of weak references in the script-to-Java bridge for V8.Steve Block2010-01-085-56/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "Fix a code ugliness issue: avoid using two variables named "size" ↵Andrei Popescu2010-01-081-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | inside the same for loop."
| * | | | | | Fix a code ugliness issue: avoid using two variables named "size" inside the ↵Andrei Popescu2010-01-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | same for loop.
* | | | | | | am dd9c60d0: am 5cf18d3a: Merge "Updates V8 version of JavaInstance to use ↵Steve Block2010-01-082-10/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RefCounted, rather than implementing custom ref and deref methods." into eclair-mr2 Merge commit 'dd9c60d0c71b85e87676f43d262ee722357e9f63' * commit 'dd9c60d0c71b85e87676f43d262ee722357e9f63': Updates V8 version of JavaInstance to use RefCounted, rather than implementing custom ref and deref methods.
| * | | | | am 5cf18d3a: Merge "Updates V8 version of JavaInstance to use RefCounted, ↵Steve Block2010-01-082-10/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rather than implementing custom ref and deref methods." into eclair-mr2 Merge commit '5cf18d3a4942dd7fba1f03621d53d66412b1b3df' into eclair-mr2-plus-aosp * commit '5cf18d3a4942dd7fba1f03621d53d66412b1b3df': Updates V8 version of JavaInstance to use RefCounted, rather than implementing custom ref and deref methods.
| | * | | | Merge "Updates V8 version of JavaInstance to use RefCounted, rather than ↵Steve Block2010-01-082-10/+2
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | implementing custom ref and deref methods." into eclair-mr2
| | | * | | Updates V8 version of JavaInstance to use RefCounted, rather than ↵Steve Block2009-12-302-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implementing custom ref and deref methods. Change-Id: I9cc775224edcda65884461eaf0f4ff7efb5922be
* | | | | | Update WebCore/platform/network with changes upstreamed inAndrei Popescu2010-01-083-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=32871 https://bugs.webkit.org/show_bug.cgi?id=32873 This will be submitted once the above changes land upstream.
* | | | | | 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.
| * | | | | am 15f1e443: In motionUp, update the CachedHistory\'s mMouseBounds.Leon Scroggins2010-01-071-1/+3
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '15f1e443f22288ee82cde972517ebf3cc1153d97' into eclair-mr2-plus-aosp * commit '15f1e443f22288ee82cde972517ebf3cc1153d97': In motionUp, update the CachedHistory's mMouseBounds.
generated by cgit v1.1 at 2024-09-17 20:19:42 +0000