OSDN Git Service

android-x86/external-webkit.git
13 years agoam c194fa2c: (-s ours) am ee4c9585: Cherry-pick WebKit security fix (webkit.org r6934...
Ben Murdoch [Thu, 21 Oct 2010 22:31:00 +0000 (15:31 -0700)]
am c194fa2c: (-s ours) am ee4c9585: Cherry-pick WebKit security fix (webkit.org r69345) Do not merge

Merge commit 'c194fa2ce4ff53dae520be0ee6759a6f9f367db0'

* commit 'c194fa2ce4ff53dae520be0ee6759a6f9f367db0':
  Cherry-pick WebKit security fix (webkit.org r69345) Do not merge

13 years agoam 219c89f0: (-s ours) am 3017f37b: Cherry-pick WebKit security fix (webkit.org r6870...
Ben Murdoch [Thu, 21 Oct 2010 22:30:57 +0000 (15:30 -0700)]
am 219c89f0: (-s ours) am 3017f37b: Cherry-pick WebKit security fix (webkit.org r68705) Do not merge

Merge commit '219c89f043c10eba31fc94db69a8136bbc115d1d'

* commit '219c89f043c10eba31fc94db69a8136bbc115d1d':
  Cherry-pick WebKit security fix (webkit.org r68705) Do not merge

13 years agoam 122a6b03: (-s ours) am 910dc2ab: Cherry-pick WebKit security fix (webkit.org r6947...
Ben Murdoch [Thu, 21 Oct 2010 22:30:54 +0000 (15:30 -0700)]
am 122a6b03: (-s ours) am 910dc2ab: Cherry-pick WebKit security fix (webkit.org r69476) Do not merge

Merge commit '122a6b03f21c5ec726d905d08531bdb8f1c7a376'

* commit '122a6b03f21c5ec726d905d08531bdb8f1c7a376':
  Cherry-pick WebKit security fix (webkit.org r69476) Do not merge

13 years agoam d377cc76: (-s ours) am 80a0e2c2: Cherry-pick WebKit security fix (webkit.org r6840...
Ben Murdoch [Thu, 21 Oct 2010 22:30:50 +0000 (15:30 -0700)]
am d377cc76: (-s ours) am 80a0e2c2: Cherry-pick WebKit security fix (webkit.org r68408) Do not merge

Merge commit 'd377cc767167c529a2effc0b1740b31f01ba6f9d'

* commit 'd377cc767167c529a2effc0b1740b31f01ba6f9d':
  Cherry-pick WebKit security fix (webkit.org r68408) Do not merge

13 years agoam 741c2272: (-s ours) am d3bed0e7: Cherry-pick WebKit security fix (webkit.org r6809...
Ben Murdoch [Thu, 21 Oct 2010 22:30:46 +0000 (15:30 -0700)]
am 741c2272: (-s ours) am d3bed0e7: Cherry-pick WebKit security fix (webkit.org r68096) Do not merge

Merge commit '741c22725f573421f088db6a32064bf210ba80ae'

* commit '741c22725f573421f088db6a32064bf210ba80ae':
  Cherry-pick WebKit security fix (webkit.org r68096) Do not merge

13 years agoam 7616c8cd: (-s ours) am 8da84207: Cherry-pick WebKit security fix (webkit.org r6848...
Ben Murdoch [Thu, 21 Oct 2010 22:30:42 +0000 (15:30 -0700)]
am 7616c8cd: (-s ours) am 8da84207: Cherry-pick WebKit security fix (webkit.org r68485) Do not merge

Merge commit '7616c8cd53cceb7d29b9382fc6754e46725af8fc'

* commit '7616c8cd53cceb7d29b9382fc6754e46725af8fc':
  Cherry-pick WebKit security fix (webkit.org r68485) Do not merge

13 years agoam ec63c9f9: (-s ours) am a7b8ec70: Cherry-pick WebKit security fix (webkit.org r6886...
Ben Murdoch [Thu, 21 Oct 2010 22:30:34 +0000 (15:30 -0700)]
am ec63c9f9: (-s ours) am a7b8ec70: Cherry-pick WebKit security fix (webkit.org r68860) Do not merge

Merge commit 'ec63c9f977997c275ca985c2ffa5cad8a2e29523'

* commit 'ec63c9f977997c275ca985c2ffa5cad8a2e29523':
  Cherry-pick WebKit security fix (webkit.org r68860) Do not merge

13 years agoMerge "Fix debug statements."
Patrick Scott [Thu, 21 Oct 2010 19:14:48 +0000 (12:14 -0700)]
Merge "Fix debug statements."

13 years agoFix debug statements.
Patrick Scott [Thu, 21 Oct 2010 18:51:28 +0000 (14:51 -0400)]
Fix debug statements.

Change-Id: Id37bf0a8b5864fea2490bd2dc5d4a1f52bc56c1d

13 years agoam ee4c9585: Cherry-pick WebKit security fix (webkit.org r69345) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 18:46:21 +0000 (11:46 -0700)]
am ee4c9585: Cherry-pick WebKit security fix (webkit.org r69345) Do not merge

Merge commit 'ee4c9585fe53aff7a0aa833b9a5d3e861e16578e' into gingerbread-plus-aosp

* commit 'ee4c9585fe53aff7a0aa833b9a5d3e861e16578e':
  Cherry-pick WebKit security fix (webkit.org r69345) Do not merge

13 years agoam 3017f37b: Cherry-pick WebKit security fix (webkit.org r68705) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 18:46:18 +0000 (11:46 -0700)]
am 3017f37b: Cherry-pick WebKit security fix (webkit.org r68705) Do not merge

Merge commit '3017f37b06cfa16f11a1e986e3c4ecc0c4757c32' into gingerbread-plus-aosp

* commit '3017f37b06cfa16f11a1e986e3c4ecc0c4757c32':
  Cherry-pick WebKit security fix (webkit.org r68705) Do not merge

13 years agoam 910dc2ab: Cherry-pick WebKit security fix (webkit.org r69476) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 18:46:15 +0000 (11:46 -0700)]
am 910dc2ab: Cherry-pick WebKit security fix (webkit.org r69476) Do not merge

Merge commit '910dc2ab50b8f32067f7b45f9e46d26a2aa681c6' into gingerbread-plus-aosp

* commit '910dc2ab50b8f32067f7b45f9e46d26a2aa681c6':
  Cherry-pick WebKit security fix (webkit.org r69476) Do not merge

13 years agoam 80a0e2c2: Cherry-pick WebKit security fix (webkit.org r68408) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 18:46:11 +0000 (11:46 -0700)]
am 80a0e2c2: Cherry-pick WebKit security fix (webkit.org r68408) Do not merge

Merge commit '80a0e2c21aa3d6657bbf3fbd69e5eb624f16a1bf' into gingerbread-plus-aosp

* commit '80a0e2c21aa3d6657bbf3fbd69e5eb624f16a1bf':
  Cherry-pick WebKit security fix (webkit.org r68408) Do not merge

13 years agoam d3bed0e7: Cherry-pick WebKit security fix (webkit.org r68096) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 18:46:06 +0000 (11:46 -0700)]
am d3bed0e7: Cherry-pick WebKit security fix (webkit.org r68096) Do not merge

Merge commit 'd3bed0e7c739f46e955406b920498b86724e7705' into gingerbread-plus-aosp

* commit 'd3bed0e7c739f46e955406b920498b86724e7705':
  Cherry-pick WebKit security fix (webkit.org r68096) Do not merge

13 years agoam 8da84207: Cherry-pick WebKit security fix (webkit.org r68485) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 18:46:02 +0000 (11:46 -0700)]
am 8da84207: Cherry-pick WebKit security fix (webkit.org r68485) Do not merge

Merge commit '8da84207b2b14801ccc039279df2a859a4a52847' into gingerbread-plus-aosp

* commit '8da84207b2b14801ccc039279df2a859a4a52847':
  Cherry-pick WebKit security fix (webkit.org r68485) Do not merge

13 years agoam a7b8ec70: Cherry-pick WebKit security fix (webkit.org r68860) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 18:45:53 +0000 (11:45 -0700)]
am a7b8ec70: Cherry-pick WebKit security fix (webkit.org r68860) Do not merge

Merge commit 'a7b8ec708c2566cc6e69c0b464e416c018227b02' into gingerbread-plus-aosp

* commit 'a7b8ec708c2566cc6e69c0b464e416c018227b02':
  Cherry-pick WebKit security fix (webkit.org r68860) Do not merge

13 years agoMerge "Move jstringToStdString into WebCoreJni.h"
Steve Block [Thu, 21 Oct 2010 17:06:43 +0000 (10:06 -0700)]
Merge "Move jstringToStdString into WebCoreJni.h"

13 years agoMove jstringToStdString into WebCoreJni.h
Iain Merrick [Thu, 21 Oct 2010 16:56:42 +0000 (17:56 +0100)]
Move jstringToStdString into WebCoreJni.h

Also tweaked the implementation slightly to match
jstringToString16, which is more robust.

Change-Id: I614576615a6f429ea1632c395d5bc4e068c32cfb

13 years agoCherry-pick WebKit security fix (webkit.org r69345) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 16:18:11 +0000 (17:18 +0100)]
Cherry-pick WebKit security fix (webkit.org r69345) Do not merge

See http://trac.webkit.org/changeset/69345

Change-Id: Ie0f421c22fc4ec007417181c834e50033a389230

13 years agoCherry-pick WebKit security fix (webkit.org r68705) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 16:16:55 +0000 (17:16 +0100)]
Cherry-pick WebKit security fix (webkit.org r68705) Do not merge

See http://trac.webkit.org/changeset/68705

Change-Id: I5a3b76fa6e536746af794a15b187bc197000387b

13 years agoCherry-pick WebKit security fix (webkit.org r69476) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 16:09:00 +0000 (17:09 +0100)]
Cherry-pick WebKit security fix (webkit.org r69476) Do not merge

See http://trac.webkit.org/changeset/69476

Change-Id: If25c271f9d1cda225fbdf040d2f1d2bc57529768

13 years agoCherry-pick WebKit security fix (webkit.org r68408) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 16:02:36 +0000 (17:02 +0100)]
Cherry-pick WebKit security fix (webkit.org r68408) Do not merge

See http://trac.webkit.org/changeset/68408

Change-Id: I53167c57f32a43c6bd80a1aca8126f41cb01da53

13 years agoCherry-pick WebKit security fix (webkit.org r68096) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 15:28:03 +0000 (16:28 +0100)]
Cherry-pick WebKit security fix (webkit.org r68096) Do not merge

See http://trac.webkit.org/changeset/68096

Note that this is not an exact cherry pick of the above webkit
CL as it is dependant on http://trac.webkit.org/changeset/61094
that we do not have and provides the Element::isIdAttributName and
Element::getIdAttribute methods. 61094 is a large change so we do
not take it, rather use methods that achieve the same effect.

Change-Id: Ifae90116f794673a610dd7988ba366a0b51888d9

13 years agoCherry-pick WebKit security fix (webkit.org r68485) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 15:26:08 +0000 (16:26 +0100)]
Cherry-pick WebKit security fix (webkit.org r68485) Do not merge

See http://trac.webkit.org/changeset/68485

Change-Id: I714d385759a6e30d315cd2ace4aa87a2d7b28e92

13 years agoCherry-pick WebKit security fix (webkit.org r68860) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 15:17:55 +0000 (16:17 +0100)]
Cherry-pick WebKit security fix (webkit.org r68860) Do not merge

See http://trac.webkit.org/changeset/68860

Change-Id: I7860374528be836e1f4ea7c6faa48966fd3ed23c

13 years agoFix Chromium HTTP request context getters to use raw pointers
Steve Block [Wed, 20 Oct 2010 16:24:30 +0000 (17:24 +0100)]
Fix Chromium HTTP request context getters to use raw pointers

All call sites into the Chromium stack take raw pointers rather than
scoped_refptr, so we should do the same for simplicity. This change
also makes the ownership model more clear.

Previously we were sometimes throwing away the scoped_refptr and using
the raw pointer, which is unsafe unless you know that somebody else
holds a reference.

Requires a change to external/chromium ...
https://android-git.corp.google.com/g/75220

Change-Id: I09c86d424193a3f3c2644bcf77a2d363fa24293b

13 years agoMerge "Fix tiles starvation bug + some debug logs"
Nicolas Roard [Wed, 20 Oct 2010 22:43:58 +0000 (15:43 -0700)]
Merge "Fix tiles starvation bug + some debug logs"

13 years agoFix tiles starvation bug + some debug logs
Nicolas Roard [Wed, 20 Oct 2010 22:13:17 +0000 (15:13 -0700)]
Fix tiles starvation bug + some debug logs

Bug:3112643
Change-Id: I9d5adf51dc95f44b859b107666d2c2731f37b12c

13 years agoMerge "Fix AutoFill after merge to Chromium merge to 7.0.540.0"
Ben Murdoch [Wed, 20 Oct 2010 18:35:44 +0000 (11:35 -0700)]
Merge "Fix AutoFill after merge to Chromium merge to 7.0.540.0"

13 years agoMerge "Implement file downloads for Chrome HTTP stack (C++ side)"
Ben Murdoch [Wed, 20 Oct 2010 15:36:11 +0000 (08:36 -0700)]
Merge "Implement file downloads for Chrome HTTP stack (C++ side)"

13 years agoImplement file downloads for Chrome HTTP stack (C++ side)
Iain Merrick [Mon, 18 Oct 2010 17:03:00 +0000 (18:03 +0100)]
Implement file downloads for Chrome HTTP stack (C++ side)

Due to the way the WebView API works, downloads are handled by the Java
client code via the DownloadListener interface, so we need to toss them
over the JNI wall.

I had to refactor WebResourceRequest slightly to save the user-agent
header before it gets stripped out. I have also made it const-correct.

Test: manually checked that we can download a file, with both stacks.

See matching change in frameworks/base (I87e71deb)

Change-Id: I8130040099d02c399d42b223444b333398628235

13 years agoMerge "Removes the unused default userAgent from WebRequestContext"
Steve Block [Wed, 20 Oct 2010 13:57:38 +0000 (06:57 -0700)]
Merge "Removes the unused default userAgent from WebRequestContext"

13 years agoRemoves the unused default userAgent from WebRequestContext
Steve Block [Wed, 20 Oct 2010 10:56:07 +0000 (11:56 +0100)]
Removes the unused default userAgent from WebRequestContext

Bug: 3035160
Change-Id: Iaf163ea571f5d9811b5d14f83e5b02948748ff84

13 years agoFix AutoFill after merge to Chromium merge to 7.0.540.0
Ben Murdoch [Wed, 20 Oct 2010 13:16:14 +0000 (14:16 +0100)]
Fix AutoFill after merge to Chromium merge to 7.0.540.0

Chromium now seems to enforce that profile unique ids cannot be
zero (as the default ctor leaves them). Read the correct id from
the Java WebSettings.AutoFillProfile class.

Requires a corresponding change in frameworks/base:
I88cd1e91b8c6043c732a1709a89fda4a3c9f921f.

Change-Id: I736220dccd8d68c395d6742e38a063da4140a13b

13 years agoMerge "Cleanup BaseTile and BackedDoubleBufferedTexture classes."
Derek Sollenberger [Wed, 20 Oct 2010 12:00:52 +0000 (05:00 -0700)]
Merge "Cleanup BaseTile and BackedDoubleBufferedTexture classes."

13 years agoFix for Find scrolling too often.
Leon Scroggins [Tue, 19 Oct 2010 17:16:11 +0000 (13:16 -0400)]
Fix for Find scrolling too often.

Bug:3108852

Do not scroll if nativeFindAll is called with the same string
and the current match location has not changed.

Requires a change to frameworks/base.

Change-Id: Id3f104d91a0061f1d007b54a8fdd188b239e7970

13 years agoam 2346109e: (-s ours) am 93bec1ec: DO NOT MERGE : Fix Webkit comments for document...
Ben Murdoch [Tue, 19 Oct 2010 18:20:53 +0000 (11:20 -0700)]
am 2346109e: (-s ours) am 93bec1ec: DO NOT MERGE : Fix Webkit comments for document.createTouch

Merge commit '2346109e92285bff201be0b45f51054d4b1f26a8'

* commit '2346109e92285bff201be0b45f51054d4b1f26a8':
  DO NOT MERGE : Fix Webkit comments for document.createTouch

13 years agoMerge "Fix crash in hardware accelerated webviews."
Derek Sollenberger [Tue, 19 Oct 2010 17:56:10 +0000 (10:56 -0700)]
Merge "Fix crash in hardware accelerated webviews."

13 years agoCleanup BaseTile and BackedDoubleBufferedTexture classes.
Derek Sollenberger [Mon, 18 Oct 2010 17:35:08 +0000 (13:35 -0400)]
Cleanup BaseTile and BackedDoubleBufferedTexture classes.

The cleanup consists of:
1. removing unused variables and functions
2. refactoring the backed texture to reduce number of exposed variables

Change-Id: I8a36725f61c5ecd77b7a215ec75a7b8129bf56af

13 years agoam 15643db2: am 77ab6dc8: Don\'t force video end event when full screen video playing...
Shimeng (Simon) Wang [Tue, 19 Oct 2010 17:43:57 +0000 (10:43 -0700)]
am 15643db2: am 77ab6dc8: Don\'t force video end event when full screen video playing is returned.

Merge commit '15643db2b790d467b78582c3bad440fb42d35df1'

* commit '15643db2b790d467b78582c3bad440fb42d35df1':
  Don't force video end event when full screen video playing is returned.

13 years agoam 93bec1ec: DO NOT MERGE : Fix Webkit comments for document.createTouch
Ben Murdoch [Tue, 19 Oct 2010 17:30:21 +0000 (10:30 -0700)]
am 93bec1ec: DO NOT MERGE : Fix Webkit comments for document.createTouch

Merge commit '93bec1ec2d7bca6a6df6bb0391d1b6a0d6562f33' into gingerbread-plus-aosp

* commit '93bec1ec2d7bca6a6df6bb0391d1b6a0d6562f33':
  DO NOT MERGE : Fix Webkit comments for document.createTouch

13 years agoFix crash in hardware accelerated webviews.
Derek Sollenberger [Tue, 19 Oct 2010 17:24:00 +0000 (13:24 -0400)]
Fix crash in hardware accelerated webviews.

We are not freeing the baseTile objects when leaving a page and
are running out of memory.

bug: 3107362
Change-Id: I52539d7b94d914b9ede44715362cbde94a7c077e

13 years agoMerge "Fix a few drawing issues with layers."
Patrick Scott [Tue, 19 Oct 2010 15:31:58 +0000 (08:31 -0700)]
Merge "Fix a few drawing issues with layers."

13 years agoFix a few drawing issues with layers.
Patrick Scott [Tue, 19 Oct 2010 15:20:53 +0000 (11:20 -0400)]
Fix a few drawing issues with layers.

The overflow layer clip was in the wrong location and caused some blank areas on
developer.android.com.  Only scroll layers if they have overflow scrolling so
that image search draws correctly.

Bug: 30276443022562
Change-Id: Iff4b27b9fd860e9d89286034c9ae82f76b1371c2

13 years agoFixing WebKit APIs affected by Chromium 7.0.540.0 merge
Iain Merrick [Wed, 13 Oct 2010 14:08:26 +0000 (15:08 +0100)]
Fixing WebKit APIs affected by Chromium 7.0.540.0 merge

WebUrlLoaderClient, WebRequest: changing std::wstring to string16
http://src.chromium.org/viewvc/chrome?view=rev&revision=54101

HostResolver parameters changed, fixing WebRequestContext.cpp
http://src.chromium.org/viewvc/chrome?view=rev&revision=57189

Icon parameter added to AutoFillHost, fixing AutoFillHostAndroid.
http://src.chromium.org/viewvc/chrome?view=rev&revision=54052

Change-Id: If6a17af7da3b80d039205883019e4a73eb35f562

13 years agoDO NOT MERGE : Fix Webkit comments for document.createTouch
Ben Murdoch [Sun, 17 Oct 2010 15:26:08 +0000 (16:26 +0100)]
DO NOT MERGE : Fix Webkit comments for document.createTouch

Cherry pick to GingerBread.

See WebKit bug https://bugs.webkit.org/show_bug.cgi?id=47676
for details.

Bug: 3101402
Change-Id: I8e2b0fc54468cd0827229243716c7d6bb62c7b3c

13 years agoMerge "Fix Webkit review comments for document.createTouch"
Ben Murdoch [Tue, 19 Oct 2010 12:49:14 +0000 (05:49 -0700)]
Merge "Fix Webkit review comments for document.createTouch"

13 years agoMerge "compute cursor rings when layers are transparent"
Cary Clark [Tue, 19 Oct 2010 12:48:33 +0000 (05:48 -0700)]
Merge "compute cursor rings when layers are transparent"

13 years agoam 06308c2c: (-s ours) am 156ddd48: Add more padding round select boxes, use differen...
Leon Clarke [Tue, 19 Oct 2010 01:11:12 +0000 (18:11 -0700)]
am 06308c2c: (-s ours) am 156ddd48: Add more padding round select boxes, use different assets at different resolutions, use new assets and don\'t deform the arrows when stretching the select box. b/issue?id=2506670

Merge commit '06308c2c073199a5f22f9c2f21cb7108d9a4bd29'

* commit '06308c2c073199a5f22f9c2f21cb7108d9a4bd29':
  Add more padding round select boxes, use different assets at

13 years agoam c79cedac: (-s ours) am 7d095dd5: fix the pause() problem...
Nicolas Roard [Tue, 19 Oct 2010 01:11:09 +0000 (18:11 -0700)]
am c79cedac: (-s ours) am 7d095dd5: fix the pause() problem...

Merge commit 'c79cedac9aa9e2d06331d855d654d63fc5165019'

* commit 'c79cedac9aa9e2d06331d855d654d63fc5165019':
  fix the pause() problem...

13 years agoam e4f471f5: (-s ours) am 44b3c7e8: Fix media element creation
Nicolas Roard [Tue, 19 Oct 2010 01:11:06 +0000 (18:11 -0700)]
am e4f471f5: (-s ours) am 44b3c7e8: Fix media element creation

Merge commit 'e4f471f5ba8f8131ef446dc75407155081b22308'

* commit 'e4f471f5ba8f8131ef446dc75407155081b22308':
  Fix media element creation

13 years agoam 7fc27f09: (-s ours) am 3d57c253: Implement the audio tag in webkit -- the correspo...
Nicolas Roard [Tue, 19 Oct 2010 01:11:00 +0000 (18:11 -0700)]
am 7fc27f09: (-s ours) am 3d57c253: Implement the audio tag in webkit -- the corresponding java CL is https://android-git.corp.google.com/g/#change,41406

Merge commit '7fc27f0903bfc72035faff876d0673c9064085ac'

* commit '7fc27f0903bfc72035faff876d0673c9064085ac':
  Implement the audio tag in webkit -- the corresponding java CL is https://android-git.corp.google.com/g/#change,41406

13 years agoam 77ab6dc8: Don\'t force video end event when full screen video playing is returned.
Shimeng (Simon) Wang [Tue, 19 Oct 2010 00:04:33 +0000 (17:04 -0700)]
am 77ab6dc8: Don\'t force video end event when full screen video playing is returned.

Merge commit '77ab6dc8b75bf7684366ba6e154ed3f95a125a55' into gingerbread-plus-aosp

* commit '77ab6dc8b75bf7684366ba6e154ed3f95a125a55':
  Don't force video end event when full screen video playing is returned.

13 years agoam fdbac3da: (-s ours) am 5013a3fb: DO NOT MERGE Implement the document.createTouch...
Ben Murdoch [Mon, 18 Oct 2010 23:41:00 +0000 (16:41 -0700)]
am fdbac3da: (-s ours) am 5013a3fb: DO NOT MERGE Implement the document.createTouch, createTouchList APIs

Merge commit 'fdbac3da7f70871a0f62e593fc068844d1f7ae84'

* commit 'fdbac3da7f70871a0f62e593fc068844d1f7ae84':
  DO NOT MERGE Implement the document.createTouch, createTouchList APIs

13 years agoDon't force video end event when full screen video playing is returned.
Shimeng (Simon) Wang [Mon, 18 Oct 2010 21:41:06 +0000 (14:41 -0700)]
Don't force video end event when full screen video playing is returned.

Use pause instead.

issue: 3102273
Change-Id: Ic4ba84a5d9f7976abbb8ff0443f1d00f4a8390f8

13 years agoMerge "Fix books.google.com purchase page."
Patrick Scott [Mon, 18 Oct 2010 21:46:49 +0000 (14:46 -0700)]
Merge "Fix books.google.com purchase page."

13 years agoFix books.google.com purchase page.
Patrick Scott [Mon, 18 Oct 2010 21:41:38 +0000 (17:41 -0400)]
Fix books.google.com purchase page.

We have to copy the data between threads.

Bug: 3105145
Change-Id: I955d033815aaf3fd18fdac52ab8cf9b23c107436

13 years agocompute cursor rings when layers are transparent
Cary Clark [Wed, 29 Sep 2010 20:37:54 +0000 (16:37 -0400)]
compute cursor rings when layers are transparent

Google search suggestions are drawn in a popup
menu (a div with a small amount of transparency).

This can partially or complete obscure links underneath the popup,
and can present touchable targets which may be much larger than
the text contained by the link.

CachedRoot::checkRings() determines if a larger bounding box
can be used for the ring around the link.

CachedRoot::maskIfHidden() determines if the ring needs to be
cut down in size because it is only partially visible, or fully
obscured.

Both routines share the implementation that gathers information
about the link, which uses RingCanvas to parse the picture, and
RingCheck to build layers describing the text and rectangles
drawn in the area around the ring.

The basic strategy is to find the text contained by the link
under consideration, and see if subsequent drawing obscures the
text, or if other text would be enclosed by enlarging the ring.

Since maskIfHidden() works better now than before, this CL
enabled checking for hidden links when recomputing the current
selection after the picture updates.

It also checks to see if the link can be larger when
maskIfHidden() determines that it is unclipped.

Also, if a tap is inside the larger ring, but not on the text
itself, treat that as a valid hit. (In CachedFrame::findBestHitAt)

And, this fixes CacheBuilder debugging code, and the CacheBuilder
array crasher described by bug: 3043268

bug: 2661613
Change-Id: I751f6539f6c840889a58de8c4611364442b3e37c

13 years agoMake sure the focus node is an HTMLInputElement before checking whether it's a passwo...
Steve Block [Mon, 18 Oct 2010 15:07:38 +0000 (16:07 +0100)]
Make sure the focus node is an HTMLInputElement before checking whether it's a password field

Bug: 3105611
Change-Id: I9190b50265d3b1ea9639dbdae1d513aefb93c9f3

13 years agoMerge "Rename DeviceOrientationManager to DeviceMotionAndOrientationManager"
Steve Block [Mon, 18 Oct 2010 17:40:42 +0000 (10:40 -0700)]
Merge "Rename DeviceOrientationManager to DeviceMotionAndOrientationManager"

13 years agoam ee47e11a: (-s ours) am f6b396da: DO NOT MERGE
Shimeng (Simon) Wang [Mon, 18 Oct 2010 17:30:20 +0000 (10:30 -0700)]
am ee47e11a: (-s ours) am f6b396da: DO NOT MERGE

Merge commit 'ee47e11a95731328130ec0382054072fbbeb2913'

* commit 'ee47e11a95731328130ec0382054072fbbeb2913':
  DO NOT MERGE

13 years agoam 156ddd48: Add more padding round select boxes, use different assets at different...
Leon Clarke [Mon, 18 Oct 2010 17:27:02 +0000 (10:27 -0700)]
am 156ddd48: Add more padding round select boxes, use different assets at different resolutions, use new assets and don\'t deform the arrows when stretching the select box. b/issue?id=2506670

Merge commit '156ddd48e9c54012469fed6e7341586e0425c3d2' into gingerbread-plus-aosp

* commit '156ddd48e9c54012469fed6e7341586e0425c3d2':
  Add more padding round select boxes, use different assets at

13 years agoam 7d095dd5: fix the pause() problem...
Nicolas Roard [Mon, 18 Oct 2010 17:27:00 +0000 (10:27 -0700)]
am 7d095dd5: fix the pause() problem...

Merge commit '7d095dd5f96c8f68593ba0e848e5e26bb3785e5d' into gingerbread-plus-aosp

* commit '7d095dd5f96c8f68593ba0e848e5e26bb3785e5d':
  fix the pause() problem...

13 years agoam 44b3c7e8: Fix media element creation
Nicolas Roard [Mon, 18 Oct 2010 17:26:57 +0000 (10:26 -0700)]
am 44b3c7e8: Fix media element creation

Merge commit '44b3c7e814ec1151cbbcfb1960b9a1d44d0359ac' into gingerbread-plus-aosp

* commit '44b3c7e814ec1151cbbcfb1960b9a1d44d0359ac':
  Fix media element creation

13 years agoam 3d57c253: Implement the audio tag in webkit -- the corresponding java CL is https...
Nicolas Roard [Mon, 18 Oct 2010 17:26:54 +0000 (10:26 -0700)]
am 3d57c253: Implement the audio tag in webkit -- the corresponding java CL is https://android-git.corp.google.com/g/#change,41406

Merge commit '3d57c253bfa22c17c5f38a70e162a6115a1809b6' into gingerbread-plus-aosp

* commit '3d57c253bfa22c17c5f38a70e162a6115a1809b6':
  Implement the audio tag in webkit -- the corresponding java CL is https://android-git.corp.google.com/g/#change,41406

13 years agoMerge "Add a file to record the LayoutTest directories in the Android tree"
Steve Block [Mon, 18 Oct 2010 15:44:18 +0000 (08:44 -0700)]
Merge "Add a file to record the LayoutTest directories in the Android tree"

13 years agoFix Webkit review comments for document.createTouch
Ben Murdoch [Sun, 17 Oct 2010 15:26:08 +0000 (16:26 +0100)]
Fix Webkit review comments for document.createTouch

See WebKit bug https://bugs.webkit.org/show_bug.cgi?id=47676
for details.

Change-Id: I232445c78d59ed3d13c9bcd86b9fa9590ffae552

13 years agoAdd more padding round select boxes, use different assets at
Leon Clarke [Wed, 21 Apr 2010 13:20:35 +0000 (14:20 +0100)]
Add more padding round select boxes, use different assets at
different resolutions, use new assets and don't deform the arrows
when stretching the select box.
http://b/issue?id=2506670

DO NOT MERGE, cherry pick to GingerBread
Bug: 3101402

Change-Id: I21224922db45c1cf4585667d8fa323c6a59dd240

13 years agofix the pause() problem...
Nicolas Roard [Tue, 11 May 2010 22:46:00 +0000 (15:46 -0700)]
fix the pause() problem...

DO NOT MERGE, cherry pick to Gingerbread from master.

Bug: 3101402
Change-Id: Ifbdab630badfffa12bc166ac20e804efba16436a

13 years agoFix media element creation
Nicolas Roard [Tue, 11 May 2010 19:20:30 +0000 (12:20 -0700)]
Fix media element creation

Cherry pick to Gingerbread, DO NOT MERGE!

Bug:3101402

Change-Id: I095182351ef49d5931241a50ab0880d6743659a5

13 years agoImplement the audio tag in webkit -- the corresponding java CL is https://android...
Nicolas Roard [Tue, 2 Feb 2010 13:11:32 +0000 (13:11 +0000)]
Implement the audio tag in webkit -- the corresponding java CL is https://android-git.corp.google.com/g/#change,41406

Cherry pick to Gingerbread, DO NOT MERGE!

Bug:3101402
Change-Id: Idbfb0efcc777f9354fcf88df32105ca9e50a24cd

13 years agoAdd a file to record the LayoutTest directories in the Android tree
Steve Block [Mon, 18 Oct 2010 10:30:33 +0000 (11:30 +0100)]
Add a file to record the LayoutTest directories in the Android tree

This is used when merging WebKit

Change-Id: Ie7fa9e85249331e28490bfbb640e4caf78f3ae1e

13 years agoam 5013a3fb: DO NOT MERGE Implement the document.createTouch, createTouchList APIs
Ben Murdoch [Mon, 18 Oct 2010 10:09:02 +0000 (03:09 -0700)]
am 5013a3fb: DO NOT MERGE Implement the document.createTouch, createTouchList APIs

Merge commit '5013a3fb99f9ca1c7be4319cdebc7cddcaa56d7c' into gingerbread-plus-aosp

* commit '5013a3fb99f9ca1c7be4319cdebc7cddcaa56d7c':
  DO NOT MERGE Implement the document.createTouch, createTouchList APIs

13 years agoDO NOT MERGE Implement the document.createTouch, createTouchList APIs
Ben Murdoch [Sun, 17 Oct 2010 15:33:00 +0000 (16:33 +0100)]
DO NOT MERGE Implement the document.createTouch, createTouchList APIs

Cherry pick to Gingerbread to enable HTML5 video playback on some
sites that look for certain APIs to determine player compatability.

Do not merge.

Bug: 3101402

Change-Id: Id54f4cbac23208249922c3ef44086c8d9828d32c

13 years agoam f6b396da: DO NOT MERGE
Shimeng (Simon) Wang [Sat, 16 Oct 2010 01:36:02 +0000 (18:36 -0700)]
am f6b396da: DO NOT MERGE

Merge commit 'f6b396da7ac510af40b99ef1f2b0d9063cb8577c' into gingerbread-plus-aosp

* commit 'f6b396da7ac510af40b99ef1f2b0d9063cb8577c':
  DO NOT MERGE

13 years agoDO NOT MERGE
Shimeng (Simon) Wang [Thu, 16 Sep 2010 22:03:07 +0000 (15:03 -0700)]
DO NOT MERGE

For cherry-picking to GB.

Implement supportsType in MediaPlayerPrivateAndroid.

Use Java API to obtain this info.

issue: 3101402
Change-Id: I2baaf8ad861bec9b9b6f92fe753cbd879b33497c

13 years agoMerge "Add new keycodes."
Jeff Brown [Fri, 15 Oct 2010 23:02:12 +0000 (16:02 -0700)]
Merge "Add new keycodes."

13 years agoFix potential deadlock when acquiring a texture
Nicolas Roard [Fri, 15 Oct 2010 22:17:00 +0000 (15:17 -0700)]
Fix potential deadlock when acquiring a texture

Change-Id: Ie24613c69fd048b14003f7cbc3ad0c86ba4e295e

13 years agoMerge "Implement the document.createTouch and document.createTouchList APIs"
Andrei Popescu [Fri, 15 Oct 2010 17:59:59 +0000 (10:59 -0700)]
Merge "Implement the document.createTouch and document.createTouchList APIs"

13 years agoImplement the document.createTouch and document.createTouchList APIs
Ben Murdoch [Fri, 15 Oct 2010 16:12:52 +0000 (17:12 +0100)]
Implement the document.createTouch and document.createTouchList APIs

These are Apple extensions to the document object present on iOS
and are used by several sites to detect touch event support.

See
http://developer.apple.com/library/safari/#documentation/UserExperience/Reference/DocumentAdditionsReference/DocumentAdditions/DocumentAdditions.html
for Apple's documentation.

Upstreaming to webkit being tracked in
https://bugs.webkit.org/show_bug.cgi?id=47676

Bug: 2996106

Change-Id: I761b1494af60b5095ad9c47d54eb7240d47ae985

13 years agoRename DeviceOrientationManager to DeviceMotionAndOrientationManager
Steve Block [Fri, 15 Oct 2010 11:30:04 +0000 (12:30 +0100)]
Rename DeviceOrientationManager to DeviceMotionAndOrientationManager

Requires a corresponding change in frameworks/base ...
https://android-git.corp.google.com/g/74335

Change-Id: I8158a8a65e83fa1d0a80233250921dae2c2b4d76

13 years agoFix a crash when deleting GraphicsContextPlatformPrivate
Steve Block [Fri, 15 Oct 2010 12:59:34 +0000 (13:59 +0100)]
Fix a crash when deleting GraphicsContextPlatformPrivate

Make sure PlatformGraphicsContext::mCanvas is still around when we
call restore().

Bug: 3071206
Change-Id: I5b3bc40448e1d891a47f214d18daf345d55d9284

13 years agoRename to_string() to jstringToWtfString() for greater clarity
Steve Block [Thu, 14 Oct 2010 11:34:16 +0000 (12:34 +0100)]
Rename to_string() to jstringToWtfString() for greater clarity

Change-Id: I8516c4f39a38e236d0bff38a91fe8657cfcf8ad4

13 years agoAdd new keycodes.
Jeff Brown [Mon, 4 Oct 2010 19:42:02 +0000 (12:42 -0700)]
Add new keycodes.

Bug: 2912307
Change-Id: I8560879fa057af7a3193233db45506d1d4d419a0

13 years agoresolved conflicts for merge of 1457b739 to master
Kenny Root [Fri, 15 Oct 2010 05:59:38 +0000 (22:59 -0700)]
resolved conflicts for merge of 1457b739 to master

Change-Id: I5e5460ec4afde9a229c3f73255f4d40322eb7166

13 years agoFix PictureSet update crash
Nicolas Roard [Thu, 14 Oct 2010 23:18:12 +0000 (16:18 -0700)]
Fix PictureSet update crash

Change-Id: I5fec3f1ce421831b3fecae4030d63a29fe75fa1c

13 years agoCleanup TiledPage class.
Derek Sollenberger [Thu, 14 Oct 2010 20:02:09 +0000 (16:02 -0400)]
Cleanup TiledPage class.

The cleanup consists of:
1. renaming m_baseTextures to m_baseTiles
2. caching the inverse scale to speed up the draw calls
3. removing currentPictureMethod as it is available through GLWebViewState
4. adding comments to the public methods
5. some small source code optimizations

Change-Id: I831500da335a3afac7232524b74e63436ea65efb

13 years agoMerge "Cleanup the TileSet class."
Derek Sollenberger [Thu, 14 Oct 2010 19:19:40 +0000 (12:19 -0700)]
Merge "Cleanup the TileSet class."

13 years agoCleanup the TileSet class.
Derek Sollenberger [Thu, 14 Oct 2010 15:27:43 +0000 (11:27 -0400)]
Cleanup the TileSet class.

The cleanup consisted of three pieces:
1. rename the class to TileSet since a set implies multiple tiles.
2. removed unused variables and uncessary methods.
3. cleaned up coding style and added comments.

Change-Id: I605fce367e4d1e8cb795f1e9bfab0ce0999dc7e3

13 years agoMerge "Fix crash bug when calling WebView::clearView()"
Nicolas Roard [Thu, 14 Oct 2010 19:04:34 +0000 (12:04 -0700)]
Merge "Fix crash bug when calling WebView::clearView()"

13 years agoFix crash bug when calling WebView::clearView()
Nicolas Roard [Thu, 14 Oct 2010 18:32:00 +0000 (11:32 -0700)]
Fix crash bug when calling WebView::clearView()

Bug:3097149
Change-Id: I280c0ca0e534d46570d758267c1e78c561a5b955

13 years agoSupport the complete AutoFill profile.
Ben Murdoch [Wed, 13 Oct 2010 15:50:47 +0000 (16:50 +0100)]
Support the complete AutoFill profile.

Load all AutoFill profile values from Java. Requires a
corresponding change in frameworks/base:
https://android-git.corp.google.com/g/#change,74046

Change-Id: I4567d0879f364647b649c0f3c80ce8e32423b371

13 years agoGL rendering (without layers)
Nicolas Roard [Mon, 4 Oct 2010 20:37:38 +0000 (13:37 -0700)]
GL rendering (without layers)

This is a two-parts CL, Its counterpart is https://android-git.corp.google.com/g/#change,64863

Change-Id: I40fcf3b7b6d28b887b101219c973070aeefbb777

13 years agoam e228a64d: Merge "Provide padding + border values for textfields." into gingerbread
Cary Clark [Wed, 13 Oct 2010 14:04:36 +0000 (07:04 -0700)]
am e228a64d: Merge "Provide padding + border values for textfields." into gingerbread

Merge commit 'e228a64d32a6c1f9d88cf43529f69792207585dd' into gingerbread-plus-aosp

* commit 'e228a64d32a6c1f9d88cf43529f69792207585dd':
  Provide padding + border values for textfields.

13 years agoMerge "Provide padding + border values for textfields." into gingerbread
Cary Clark [Wed, 13 Oct 2010 13:57:15 +0000 (06:57 -0700)]
Merge "Provide padding + border values for textfields." into gingerbread

13 years agoMerge "Sync autofill profile data from java."
Ben Murdoch [Wed, 13 Oct 2010 11:47:15 +0000 (04:47 -0700)]
Merge "Sync autofill profile data from java."

13 years agoMerge "Remove unnecessary mutex locks from texture sharing code"
Derek Sollenberger [Wed, 13 Oct 2010 11:36:04 +0000 (04:36 -0700)]
Merge "Remove unnecessary mutex locks from texture sharing code"

13 years agoMerge "Implement DeviceMotionEvent"
Steve Block [Wed, 13 Oct 2010 11:18:43 +0000 (04:18 -0700)]
Merge "Implement DeviceMotionEvent"

13 years agoSync autofill profile data from java.
Ben Murdoch [Wed, 6 Oct 2010 13:34:04 +0000 (14:34 +0100)]
Sync autofill profile data from java.

Add the JNI bindings so that we can get the AutoFill profile data
that the user entered in the Browser UI and inject that data into
the WebAutoFill object. This eliminates the John Smith profile!

Note that additional profile data such as addresses and phone
numbers will be added very shortly.

Requires a corresponding change to frameworks/base,
see https://android-git.corp.google.com/g/#change,72204

Change-Id: Ie32100123ef0d868e1f7efb5604c6fac48725967

13 years agoProvide padding + border values for textfields.
Leon Scroggins [Tue, 12 Oct 2010 18:01:13 +0000 (14:01 -0400)]
Provide padding + border values for textfields.

Bug:3085564

They are used by WebView.java to align the WebTextView's
text positioning with the page below.  This allows the
selection and insertion arrow handlers to line up better
with the actual selection on the page.

Requires a change in frameworks/base:
https://android-git.corp.google.com/g/#change,73565

Change-Id: Ia100286016a780abd5f30e32975f8ad566a6ed74