OSDN Git Service

android-x86/external-webkit.git
13 years agoDisable rounding hacks.
Leon Scroggins [Tue, 11 Jan 2011 21:16:27 +0000 (16:16 -0500)]
Disable rounding hacks.

Bug:3085564
Change-Id: Ie570cbac6a445a337c72466598d5550c84d803ad

13 years agoMerge changes Iad96314e,Ic978944b,Iea1a5a55,Id22f7f0c,Ia1a391a9,Ic4642c38,I561d89dc...
Ben Murdoch [Tue, 11 Jan 2011 15:50:44 +0000 (07:50 -0800)]
Merge changes Iad96314e,Ic978944b,Iea1a5a55,Id22f7f0c,Ia1a391a9,Ic4642c38,I561d89dc,Ia102dea1 into honeycomb

* changes:
  Merge Chromium at 9.0.597.55: Move formsSeen call to IO thread.
  Merge Chromium at 9.0.597.55: Remove URLRequest forward declaration.
  Merge Chromium at 9.0.597.55: Merge 67599. (2/2)
  Merge Chromium at 9.0.597.55: Merge r67599 (1/2)
  Merge Chromium at 9.0.597.55: Merge r67192
  Merge Chromium at 9.0.597.55: Add DnsCertChecker to constructor
  Merge Chromium at 9.0.597.55: Autofill: Merge r66860
  Merge Chromium at 9.0.597.55: Autofill: Merge r66850

13 years agoMerge Chromium at 9.0.597.55: Move formsSeen call to IO thread.
Ben Murdoch [Mon, 10 Jan 2011 12:40:47 +0000 (12:40 +0000)]
Merge Chromium at 9.0.597.55: Move formsSeen call to IO thread.

When we search the document for forms to be autofilled, we make a URL
request to the AutoFill server to ask it for form field data. With
Chromium r67655, this URL request needs to be made on a Chrome thread.

This is a simple fix for the merge, which blocks until the call
completes.

See http://src.chromium.org/viewvc/chrome?view=rev&revision=67655

Change-Id: Iad96314e4ecb66ee7e65c1ef846709e9c41b0e2e

13 years agoMerge Chromium at 9.0.597.55: Remove URLRequest forward declaration.
Ben Murdoch [Fri, 7 Jan 2011 16:05:19 +0000 (16:05 +0000)]
Merge Chromium at 9.0.597.55: Remove URLRequest forward declaration.

Change-Id: Ic978944b7a4e0bdda4ab09a18234456098ad26ca

13 years agoMerge Chromium at 9.0.597.55: Merge 67599. (2/2)
Ben Murdoch [Fri, 7 Jan 2011 16:04:47 +0000 (16:04 +0000)]
Merge Chromium at 9.0.597.55: Merge 67599. (2/2)

This needed a bit of work so I've split into two commits.

This is part 2, where we now need to pass both the field that
was focussed and the form it belongs to. To achieve this I have
a new class that encapsulates the pointers.

Change-Id: Iea1a5a55696c63255bcc57b070116409a2195f4c

13 years agoMerge Chromium at 9.0.597.55: Merge r67599 (1/2)
Ben Murdoch [Fri, 7 Jan 2011 14:59:53 +0000 (14:59 +0000)]
Merge Chromium at 9.0.597.55: Merge r67599 (1/2)

This is a slightly tricky merge. This first part is the easy bit.

See http://src.chromium.org/viewvc/chrome?view=rev&revision=67599

Change-Id: Id22f7f0ce0f0b7eca62f39d4e6ae65b9ea1bdcda

13 years agoMerge Chromium at 9.0.597.55: Merge r67192
Ben Murdoch [Fri, 7 Jan 2011 15:15:00 +0000 (15:15 +0000)]
Merge Chromium at 9.0.597.55: Merge r67192

See http://src.chromium.org/viewvc/chrome?view=rev&revision=67192

Change-Id: Ia1a391a9e7634e86e5c3166349befc47841b570e

13 years agoMerge Chromium at 9.0.597.55: Add DnsCertChecker to constructor
Ben Murdoch [Fri, 7 Jan 2011 16:20:24 +0000 (16:20 +0000)]
Merge Chromium at 9.0.597.55: Add DnsCertChecker to constructor

See http://src.chromium.org/viewvc/chrome?view=rev&revision=66985

Change-Id: Ic4642c38646b94fb6db9e839a671cd335f9d5c6b

13 years agoMerge Chromium at 9.0.597.55: Autofill: Merge r66860
Ben Murdoch [Fri, 7 Jan 2011 15:12:30 +0000 (15:12 +0000)]
Merge Chromium at 9.0.597.55: Autofill: Merge r66860

See http://src.chromium.org/viewvc/chrome?view=rev&revision=66860

Change-Id: I561d89dcc060af7f3e0b975e4a940c7de63d89d4

13 years agoMerge Chromium at 9.0.597.55: Autofill: Merge r66850
Ben Murdoch [Fri, 7 Jan 2011 14:58:10 +0000 (14:58 +0000)]
Merge Chromium at 9.0.597.55: Autofill: Merge r66850

Autofill: Prefer maxLength to size attribute for form filling
heuristics.

See http://src.chromium.org/viewvc/chrome?view=rev&revision=66850

Change-Id: Ia102dea1c861474e878639b91288e6845d7250ef

13 years agoremove push/pop around bitmap
Cary Clark [Tue, 11 Jan 2011 14:02:25 +0000 (09:02 -0500)]
remove push/pop around bitmap

The algorithm that analyzes cursor rings in pictures
stores the changes to the canvas (e.g. push layer, pop)
but it turns out that bitmaps may have push/pop
pairs around them that don't represent a state change.

Remove the push/pop pairs around bitmaps when creating
the cursor region stack.

bug:3299913
bug:3329011
Change-Id: I14e0508285821e2723ff460e6b09faccb44f4565

13 years agoMerge "layer or save push/pop should start new rect" into honeycomb
Cary Clark [Tue, 11 Jan 2011 12:56:08 +0000 (04:56 -0800)]
Merge "layer or save push/pop should start new rect" into honeycomb

13 years agoMerge "Fix a warning" into honeycomb
Kristian Monsen [Tue, 11 Jan 2011 10:29:00 +0000 (02:29 -0800)]
Merge "Fix a warning" into honeycomb

13 years agoRemove nativeCursorMatchesFocus method.
Leon Scroggins [Mon, 10 Jan 2011 22:51:51 +0000 (17:51 -0500)]
Remove nativeCursorMatchesFocus method.

Bug:3335014
Change-Id: I55e60cec72f27ab2877455a7899a21cbd86a0efa

13 years agoCherrypick of https://android-git.corp.google.com/g/#change,88039
Derek Sollenberger [Fri, 7 Jan 2011 21:00:35 +0000 (16:00 -0500)]
Cherrypick of https://android-git.corp.google.com/g/#change,88039
Pass multiTouch events to plugins so Adobe could try it.

Change-Id: I2c1120a85ef15db0ce45161403d56843c0037abf

13 years agoAdd Null check to the root layer
Teng-Hui Zhu [Mon, 10 Jan 2011 00:30:39 +0000 (16:30 -0800)]
Add Null check to the root layer

bug:3284834
Change-Id: If537400333a6884f92d688481ff4efe3ae5796a3

13 years agoMerge "Enable fixed layers for all websites" into honeycomb
Nicolas Roard [Mon, 10 Jan 2011 22:49:33 +0000 (14:49 -0800)]
Merge "Enable fixed layers for all websites" into honeycomb

13 years agoEnable fixed layers for all websites
Nicolas Roard [Mon, 10 Jan 2011 21:11:35 +0000 (13:11 -0800)]
Enable fixed layers for all websites

bug:2797422
Change-Id: Ide0867a06d61a7ee92af751ae824fe6c3b23c41f

13 years agoMerge "Change the transition from cross-fading to simple fading of only one of the...
Nicolas Roard [Mon, 10 Jan 2011 22:38:07 +0000 (14:38 -0800)]
Merge "Change the transition from cross-fading to simple fading of only one of the TiledPage." into honeycomb

13 years agolayer or save push/pop should start new rect
Cary Clark [Mon, 10 Jan 2011 21:33:00 +0000 (16:33 -0500)]
layer or save push/pop should start new rect

In computing cursor rings, consecutive rectangles
from the picture may be combined. If the picture
pushes or pops a canvas context, the rects
should no longer be combined, because they come
from different DOM nodes.

bug:3336522
Change-Id: I2b09220d84238873f209528bf822b9c203de9ce8

13 years agoChange the transition from cross-fading to simple fading of only one of
Nicolas Roard [Mon, 10 Jan 2011 19:08:13 +0000 (11:08 -0800)]
Change the transition from cross-fading to simple fading of only one of
the TiledPage.

bug:3335076
Change-Id: Ia2a0de24e7c13d7cf3bbae8b17e9db1e377aa8a4

13 years agoMerge "selectBestAt missing another null check" into honeycomb
Cary Clark [Mon, 10 Jan 2011 19:03:38 +0000 (11:03 -0800)]
Merge "selectBestAt missing another null check" into honeycomb

13 years agoselectBestAt missing another null check
Cary Clark [Mon, 10 Jan 2011 18:31:24 +0000 (13:31 -0500)]
selectBestAt missing another null check

bug:3334943
Change-Id: I0183634bfbe64b145edafcc84f42e213509cbc2c

13 years agoFix a warning
Kristian Monsen [Mon, 10 Jan 2011 16:27:55 +0000 (16:27 +0000)]
Fix a warning

Just changing the order so they are matched in the .h and .cpp

Change-Id: I88afbdded260a389da2134ccdc7946f649b8db37

13 years agoMerge "Ensure that PopupReply does not take action after disconnection." into honeycomb
Leon Scroggins [Mon, 10 Jan 2011 16:11:00 +0000 (08:11 -0800)]
Merge "Ensure that PopupReply does not take action after disconnection." into honeycomb

13 years agoEnsure that PopupReply does not take action after disconnection.
Leon Scroggins [Fri, 7 Jan 2011 22:01:37 +0000 (17:01 -0500)]
Ensure that PopupReply does not take action after disconnection.

Bug:3326203
Change-Id: Ieec8765fae0af7d4f2b0f56167cb1b221fa73687

13 years agoreturn the scrollable layer's content bounds
Cary Clark [Fri, 7 Jan 2011 21:05:17 +0000 (16:05 -0500)]
return the scrollable layer's content bounds

Compute and return the scrollable layer's bounds in
content space and return it to the java side.

The layer's bounds is used to determine if the
select text touch point is close to the edge and
should invoke scrolling.

Also, added a null check to selectBestAt

Requires a companion change in frameworks/base

bug:3191699
bug:3334943

Change-Id: Id066997f56da59f37350c14a4cc43fe4a7ce7312

13 years agoMerge "Fix alpha compositing in the shaders to work with premultiplied alpha textures...
Nicolas Roard [Fri, 7 Jan 2011 22:59:07 +0000 (14:59 -0800)]
Merge "Fix alpha compositing in the shaders to work with premultiplied alpha textures" into honeycomb

13 years agobug:3325039 Making the cursor ring movement send accessibility events.
Svetoslav Ganov [Thu, 6 Jan 2011 02:52:54 +0000 (18:52 -0800)]
bug:3325039 Making the cursor ring movement send accessibility events.

1. Added a mechanism to select the cursor ring content if accessibility is
   enabled - This is achieved by sending an event to the WebCore thread
   (if accessibility is enabled) to select the content of the cursor when
   the latter moves. Added code in WebViewCore to select the given node
   and notify the UI thread for the selection markup which is delivered
   of the accessibility injector which manages sending accessibility
   events. This is relevant for adding accessibility to WebView if
   JavaScript is not enabled. (If JS is enabled we inject a screenreader
   written in JS).

2. Fixed the event delegation to the accessibility injector since it
   should be able to consume key events of interest and perform some
   action which leads to sending appropriate accessibility event.
   In the previous implementation it was possible that the injector
   consumes the event but the latter was bubbled up.

3. Added function to scroll the selection into view while moving it
   around based on user commands.

Note: This is a two project change.

Change-Id: Ica27f317e194474d4e38aba5d7a2c0acc9f05a33

13 years agoFix alpha compositing in the shaders to work with premultiplied alpha
Nicolas Roard [Fri, 7 Jan 2011 21:29:09 +0000 (13:29 -0800)]
Fix alpha compositing in the shaders to work with premultiplied alpha
textures

bug:3332829
Change-Id: Iffce6322fca694e85dd51dbc4147f4309f350eca

13 years agoAdd debug info
Teng-Hui Zhu [Thu, 6 Jan 2011 00:42:38 +0000 (16:42 -0800)]
Add debug info

When we have such extra info in the log, it could lead to a root cause
more directly without manual adding and rebuilding.

bug:3307016
Change-Id: I7699c554923d1cdc4ddeb9795ad9c89687b1f27a

13 years agoMerge "Add multi-touch plugin API." into honeycomb
Derek Sollenberger [Fri, 7 Jan 2011 18:41:51 +0000 (10:41 -0800)]
Merge "Add multi-touch plugin API." into honeycomb

13 years agoRedo the clippingRect calculation
Teng-Hui Zhu [Thu, 6 Jan 2011 19:56:00 +0000 (11:56 -0800)]
Redo the clippingRect calculation

Although the intersetcion is done correctly, but the clippingRect
should take the parents' matrix into account.

To make the code cleaner, we convert all the rects into screen
coordinate for intersection.

bug:3304761
Change-Id: Ia3dc3e7b72f2e72eaab66ba8e017d89ab71dc468

13 years agoMerge "Not set max decoded image size in WebCore." into honeycomb
Shimeng (Simon) Wang [Fri, 7 Jan 2011 18:01:03 +0000 (10:01 -0800)]
Merge "Not set max decoded image size in WebCore." into honeycomb

13 years agoAdd multi-touch plugin API.
Derek Sollenberger [Fri, 7 Jan 2011 16:19:37 +0000 (11:19 -0500)]
Add multi-touch plugin API.

bug: 3302363
Change-Id: Iaaa5bdf8616043fdba47690fc130002d9fe57e8b

13 years agoMerge "Add additional debugging for plugins." into honeycomb
Derek Sollenberger [Fri, 7 Jan 2011 16:17:00 +0000 (08:17 -0800)]
Merge "Add additional debugging for plugins." into honeycomb

13 years agoAdd additional debugging for plugins.
Derek Sollenberger [Fri, 7 Jan 2011 16:04:46 +0000 (11:04 -0500)]
Add additional debugging for plugins.

Change-Id: Ie4437e0b62a16ee7e9d1b6fc605554ecc161cc6c

13 years agoMerge "Update a WebCache comment" into honeycomb
Steve Block [Fri, 7 Jan 2011 16:03:56 +0000 (08:03 -0800)]
Merge "Update a WebCache comment" into honeycomb

13 years agoUpdate a WebCache comment
Steve Block [Tue, 4 Jan 2011 15:58:40 +0000 (15:58 +0000)]
Update a WebCache comment

This should have been updated in
https://android-git.corp.google.com/g/82475

Change-Id: Ia4dee2458ebeb25bf9dc86a99b6f25f335be72dc

13 years agoMerge "Adds an optimization to cache the WebCache backend" into honeycomb
Steve Block [Fri, 7 Jan 2011 15:42:47 +0000 (07:42 -0800)]
Merge "Adds an optimization to cache the WebCache backend" into honeycomb

13 years agoMerge "Fix MIME type handling for badly-behaved servers." into honeycomb
Iain Merrick [Fri, 7 Jan 2011 13:51:41 +0000 (05:51 -0800)]
Merge "Fix MIME type handling for badly-behaved servers." into honeycomb

13 years agoFix MIME type handling for badly-behaved servers.
Iain Merrick [Thu, 6 Jan 2011 16:31:24 +0000 (16:31 +0000)]
Fix MIME type handling for badly-behaved servers.

This fixes http://scrabb.ly, which is a particularly bad example as
there is no filename and no Content-Type header. This CL duplicates
the behaviour of the Apache HTTP stack by defaulting to text/html.

Bug: 3242012
Change-Id: Id0e131ee880466e1708367612ac0217d43db347b

13 years agoMerge WebKit at Chromium 9.0.597.55: Update WebKit revision number
Ben Murdoch [Thu, 6 Jan 2011 21:48:45 +0000 (21:48 +0000)]
Merge WebKit at Chromium 9.0.597.55: Update WebKit revision number

Note that we are tracking the Chromium 9.0.597 release branch, which is
WebKit r72805 + stability cherry picks.

Change-Id: I640ea1149a9e95b7e27169a298f2fc63b544a269

13 years agoMerge WebKit at Chromium 9.0.597.55: RenderFrame docWidth method changed
Ben Murdoch [Thu, 6 Jan 2011 21:47:36 +0000 (21:47 +0000)]
Merge WebKit at Chromium 9.0.597.55: RenderFrame docWidth method changed

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

Change-Id: I8ab3171330e475bec7eade78b35b11304f74579a

13 years agoMerge WebKit at Chromium 9.0.597.55: trivial merge by git
Ben Murdoch [Thu, 6 Jan 2011 21:36:31 +0000 (21:36 +0000)]
Merge WebKit at Chromium 9.0.597.55: trivial merge by git

Change-Id: I2c6f2ebc4431d15ac82b5b1a9f08159e1731bc57

13 years agoDon't reflow if a RenderBlock has background color or image.
Shimeng (Simon) Wang [Fri, 7 Jan 2011 01:27:02 +0000 (17:27 -0800)]
Don't reflow if a RenderBlock has background color or image.

issue: 3313826
Change-Id: Ic9c87880eb6f41f72319f72123cc21cc2fe623f0

13 years agoNot set max decoded image size in WebCore.
Shimeng (Simon) Wang [Thu, 6 Jan 2011 22:14:18 +0000 (14:14 -0800)]
Not set max decoded image size in WebCore.

Two reasons:
1. the image size will be limited in ImageSourceAndroid.cpp.
2. WebCore will do an estimation comparison against that max value, which
will limit some good cases.

For example, in the case of the following bug, the background image size is limited
and good, but its estimation value in WebCore will exceed the max.

issue: 3240499
Change-Id: I721c7565beb648dd83200d05e223012299997e04

13 years agoMerge "When canceling <select> popup leave the value unchanged." into honeycomb
Leon Scroggins [Thu, 6 Jan 2011 19:39:24 +0000 (11:39 -0800)]
Merge "When canceling <select> popup leave the value unchanged." into honeycomb

13 years agoWhen canceling <select> popup leave the value unchanged.
Leon Scroggins [Thu, 6 Jan 2011 18:50:23 +0000 (13:50 -0500)]
When canceling <select> popup leave the value unchanged.

Bug:3328658

Change-Id: I70e7fa72a0f2df3957cb295efdf404fd91511610

13 years agoMerge "add iframes to the types that want key events" into honeycomb
Cary Clark [Thu, 6 Jan 2011 18:52:42 +0000 (10:52 -0800)]
Merge "add iframes to the types that want key events" into honeycomb

13 years agoadd iframes to the types that want key events
Cary Clark [Thu, 6 Jan 2011 18:43:34 +0000 (13:43 -0500)]
add iframes to the types that want key events

This is a companion change to frameworks/base, to
route the enter key to a webkit click only if the
cursor node does not want the key event.

bug:3325093
Change-Id: I78ebcec42cc413f645c080dff7f38e75e7f09c7f

13 years agoMerge "Add a stdStringToJstring() helper function" into honeycomb
Steve Block [Thu, 6 Jan 2011 18:23:10 +0000 (10:23 -0800)]
Merge "Add a stdStringToJstring() helper function" into honeycomb

13 years agoAdds an optimization to cache the WebCache backend
Steve Block [Tue, 4 Jan 2011 16:44:31 +0000 (16:44 +0000)]
Adds an optimization to cache the WebCache backend

Also does some general cleaning up.

Change-Id: If1b5a338bc6500c34d0c239a75377a2d23dc996d

13 years agoAdd a stdStringToJstring() helper function
Steve Block [Thu, 6 Jan 2011 17:35:52 +0000 (17:35 +0000)]
Add a stdStringToJstring() helper function

Change-Id: I323c753d7ce22e0e23928a126cfb99c781a074f1

13 years agoMerge "don't join non-adjacent bitmaps" into honeycomb
Cary Clark [Thu, 6 Jan 2011 18:17:07 +0000 (10:17 -0800)]
Merge "don't join non-adjacent bitmaps" into honeycomb

13 years agodon't join non-adjacent bitmaps
Cary Clark [Thu, 6 Jan 2011 18:05:07 +0000 (13:05 -0500)]
don't join non-adjacent bitmaps

When computing cursor rings, adjacent bitmaps and rectangles
may be joined into one. Glyphs may be non-adjacent to account
for intercharacter spacing and white space characters.

Bitmaps and rects may be close by but not joinable if they
don't share a common edge.

bug:3322613
Change-Id: Ie9e4b4f9f66857c533a8459c0f8a9a62d0be8dcd

13 years agoFix naming of wtfStringToJstring()
Steve Block [Thu, 6 Jan 2011 16:08:13 +0000 (16:08 +0000)]
Fix naming of wtfStringToJstring()

Change-Id: I3e1a4fb110fc9d312cc608c86fcaf7cb27431685

13 years agoMerge changes Idd1eee54,I6a266e12,Iaa56a5a5,I81915808,I956ac20a,I7e999ae3,If2386201...
Steve Block [Thu, 6 Jan 2011 14:28:27 +0000 (06:28 -0800)]
Merge changes Idd1eee54,I6a266e12,Iaa56a5a5,I81915808,I956ac20a,I7e999ae3,If2386201,I5ba4d097,Iac42b5b4,I5d2bb4e8

* changes:
  Merge WebKit at r72805: Update WebKit revision
  Merge WebKit at r72805: Cherry-pick WebKit change 73062
  Merge WebKit at r72805: Cherry-pick WebKit change 72948
  Merge WebKit at r72805: Update call sites to RenderFrame::docWidth()/docHeight()
  Merge WebKit at r72805: Undo previous conflict resolution in RenderSVGResourceSolidColor.cpp
  Merge WebKit at r72805: Update GraphicsContext method signatures
  Merge WebKit at r72805: Update EditorClient::getGuessesForWord()
  Merge WebKit at r72805: Use Node::parent() rather than Node::parentNode()
  Merge WebKit at r72805: Fix Makefiles
  Merge WebKit at r72805: Initial merge by Git

13 years agoMerge WebKit at r72805: Update WebKit revision
Steve Block [Wed, 5 Jan 2011 15:39:46 +0000 (15:39 +0000)]
Merge WebKit at r72805: Update WebKit revision

Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.

Change-Id: Idd1eee54590180c2efc16861453092295651eba3

13 years agoMerge WebKit at r72805: Cherry-pick WebKit change 73062
Steve Block [Wed, 5 Jan 2011 14:52:42 +0000 (14:52 +0000)]
Merge WebKit at r72805: Cherry-pick WebKit change 73062

This change is the upstreaming of local changes in
WebCore/platform/network. It did not generate conflicts in the merge to
r73109 as both upstream and local versions matched at r73109. But since
it appears after r72805, it was inadvertantly removed as part of the
initial merge by Git to r72805.

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

Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.

Change-Id: I6a266e1270cbc1f155065ae1c56c491ccf33e497

13 years agoMerge WebKit at r72805: Cherry-pick WebKit change 72948
Steve Block [Wed, 5 Jan 2011 15:06:26 +0000 (15:06 +0000)]
Merge WebKit at r72805: Cherry-pick WebKit change 72948

This fixes CodeGeneratorV8.pm

It is a re-commit of 'Merge WebKit at r72274: Fix CodeGeneratorV8.pm',
which was inadvertantly removed as part of the initial merge by Git to
r72805.

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

Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.

Change-Id: Iaa56a5a503aaaf4d996ebc44d66d557d12838cfa

13 years agoMerge WebKit at r72805: Update call sites to RenderFrame::docWidth()/docHeight()
Steve Block [Wed, 5 Jan 2011 12:20:13 +0000 (12:20 +0000)]
Merge WebKit at r72805: Update call sites to RenderFrame::docWidth()/docHeight()

This is effectively a revert of
"Merge Webkit at r73109: render frame docWidth/docHeight method changed."

See http://trac.webkit.org/changeset/72852 and
http://trac.webkit.org/changeset/73063

Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.

Change-Id: I81915808439847dce87beefdd527f77962e074b5

13 years agoMerge WebKit at r72805: Undo previous conflict resolution in RenderSVGResourceSolidCo...
Steve Block [Wed, 5 Jan 2011 12:24:24 +0000 (12:24 +0000)]
Merge WebKit at r72805: Undo previous conflict resolution in RenderSVGResourceSolidColor.cpp

This is effectively a partial revert of
"Merge Webkit at r73109: Fix conflicts"

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

Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.

Change-Id: I956ac20ac4985ed69921a8efad4a351ba0034e84

13 years agoMerge WebKit at r72805: Update GraphicsContext method signatures
Steve Block [Wed, 5 Jan 2011 12:29:23 +0000 (12:29 +0000)]
Merge WebKit at r72805: Update GraphicsContext method signatures

Note that this is a partial revert of
"Merge Webkit at r73109: graphics method signature changed."

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

Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.

Change-Id: I7e999ae384bd791c5953f5edcf494a008e6fceea

13 years agoMerge WebKit at r72805: Update EditorClient::getGuessesForWord()
Steve Block [Wed, 5 Jan 2011 12:35:52 +0000 (12:35 +0000)]
Merge WebKit at r72805: Update EditorClient::getGuessesForWord()

This is a revert of
"Merge Webkit at r73109: getGuessForWord method signature change"

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

Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.

Change-Id: If23862010b9e047f10991de5b428ca1b74b306b0

13 years agoMerge WebKit at r72805: Use Node::parent() rather than Node::parentNode()
Steve Block [Wed, 5 Jan 2011 12:37:24 +0000 (12:37 +0000)]
Merge WebKit at r72805: Use Node::parent() rather than Node::parentNode()

This is a revert of
"Merge WebKit at r73109: use parentNode method."

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

This reverts commit 23aa22bb0c8bf0d91c99d21c5dca4c64a4825a87.

Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.

Change-Id: I5ba4d0976c3b87b32326fdc8e2eb1cffdd7541cf

13 years agoMerge WebKit at r72805: Fix Makefiles
Steve Block [Wed, 5 Jan 2011 15:22:02 +0000 (15:22 +0000)]
Merge WebKit at r72805: Fix Makefiles

This is a partial revert of
"Merge Webkit at r73109: Fix Makefiles."

Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.

Change-Id: Iac42b5b4232b71fab322bf99e74e7fb6c7be10c5

13 years agoMerge WebKit at r72805: Initial merge by Git
Steve Block [Wed, 5 Jan 2011 12:15:11 +0000 (12:15 +0000)]
Merge WebKit at r72805: Initial merge by Git

Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.

Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790

13 years agoTurn off iframe flattening.
Patrick Scott [Thu, 6 Jan 2011 13:27:36 +0000 (08:27 -0500)]
Turn off iframe flattening.

Bug: 3304817
Change-Id: I902ba0ef0915a4546710851e2c50d13d5fd10d0b

13 years agoMerge "refine empty picture test to look for color rects"
Cary Clark [Thu, 6 Jan 2011 13:07:46 +0000 (05:07 -0800)]
Merge "refine empty picture test to look for color rects"

13 years agoKeep track of whether input fields have autocomplete.
Leon Scroggins [Wed, 5 Jan 2011 20:14:34 +0000 (15:14 -0500)]
Keep track of whether input fields have autocomplete.

Bug:3300365

Requires a change in frameworks/base.

Change-Id: Ia466cae0c43b43817651e9d5903e18aae96a814f

13 years agoMerge "clip rect fix for iframe when GL on"
Teng-Hui Zhu [Wed, 5 Jan 2011 17:19:00 +0000 (09:19 -0800)]
Merge "clip rect fix for iframe when GL on"

13 years agorefine empty picture test to look for color rects
Cary Clark [Wed, 5 Jan 2011 15:58:18 +0000 (10:58 -0500)]
refine empty picture test to look for color rects

bug:3296986
Change-Id: I171435f6285f671abc9f2e38ad00ebcabb783cb3

13 years agoMerge "Plugin API to report the onscreen visibility of the plugin."
Derek Sollenberger [Wed, 5 Jan 2011 15:48:25 +0000 (07:48 -0800)]
Merge "Plugin API to report the onscreen visibility of the plugin."

13 years agoPlugin API to report the onscreen visibility of the plugin.
Derek Sollenberger [Wed, 5 Jan 2011 14:40:04 +0000 (09:40 -0500)]
Plugin API to report the onscreen visibility of the plugin.

bug: 3324143
Change-Id: I4ad5837b4d79ee63bf53ce974a634d357130930e

13 years agouse same matrix left when reading picture
Cary Clark [Wed, 5 Jan 2011 14:36:53 +0000 (09:36 -0500)]
use same matrix left when reading picture

In select text, the nav cache picture is read multiple times.

If the matrix is different, it's possible that the text
metrics will be off by one when the text position is near
to but not equal to an integer (e.g., 315.999969). Pinning
the matrix to zero makes the matrices the same in the bug case.

Use the simpler doIRect interface if the glyph rec isn't needed.

Check for contentRender() before dereferencing it.

bug:3315620
Change-Id: I4bfaf9f9b7bf12f66b29f4609d744bceaf5b2964

13 years agostart select all without tapping
Cary Clark [Wed, 29 Dec 2010 19:54:43 +0000 (14:54 -0500)]
start select all without tapping

For the keyboard interface to 'Select All',
establish the select text context by finding some
text on the page and returning its coordinates.

This allows tapping and keyboard interfaces to share
most of the select all implementation.

bug:3270434
Change-Id: Ic080a8002115af9086a669dd366d0399b1082f3c

13 years agoam c9f38c56: (-s ours) am 08fcb454: Cherry-pick WebKit change 60729 to avoid an AppCa...
Steve Block [Wed, 5 Jan 2011 11:50:42 +0000 (03:50 -0800)]
am c9f38c56: (-s ours) am 08fcb454: Cherry-pick WebKit change 60729 to avoid an AppCache crash - DO NOT MERGE

* commit 'c9f38c569b3b11991dc69847f941517d0164bff4':
  Cherry-pick WebKit change 60729 to avoid an AppCache crash - DO NOT MERGE

13 years agoam 08fcb454: Cherry-pick WebKit change 60729 to avoid an AppCache crash - DO NOT...
Steve Block [Wed, 5 Jan 2011 11:48:41 +0000 (03:48 -0800)]
am 08fcb454: Cherry-pick WebKit change 60729 to avoid an AppCache crash - DO NOT MERGE

* commit '08fcb454f4c35929b9ab4b984ce1a279a105c585':
  Cherry-pick WebKit change 60729 to avoid an AppCache crash - DO NOT MERGE

13 years agoclip rect fix for iframe when GL on
Teng-Hui Zhu [Tue, 4 Jan 2011 23:13:55 +0000 (15:13 -0800)]
clip rect fix for iframe when GL on

First, for each layer, the clip rect should be intersecting with
all of its parents.
Then the rect should use pre-transformation info, the real
transformation will handle by the clip() function.

P.S: renaming variable "bounds" b/c there is a member function
using the same name.

bug:3304761

Change-Id: Id5d602b55da904c63b37cb5436b5bf2f5526a94f

13 years agoMerge "Add full-screen support for OpenGL based plugins."
Derek Sollenberger [Tue, 4 Jan 2011 21:42:33 +0000 (13:42 -0800)]
Merge "Add full-screen support for OpenGL based plugins."

13 years agoMerge "Remove the div element check."
Patrick Scott [Tue, 4 Jan 2011 21:29:57 +0000 (13:29 -0800)]
Merge "Remove the div element check."

13 years agoAdd full-screen support for OpenGL based plugins.
Derek Sollenberger [Tue, 4 Jan 2011 20:57:57 +0000 (15:57 -0500)]
Add full-screen support for OpenGL based plugins.

bug: 3321891
Change-Id: Ife1bbeed91b3285277bfe47c71f523d477891b98

13 years agoRemove the div element check.
Patrick Scott [Tue, 4 Jan 2011 20:58:53 +0000 (15:58 -0500)]
Remove the div element check.

This allows other elements to specify overflow.

Bug: 3310376
Change-Id: I039b07aebeefa9184b56950972222ffea1ed09c7

13 years agoMerge "Update JSDOMWindowBase to reflect recent upstreaming"
Steve Block [Tue, 4 Jan 2011 19:51:48 +0000 (11:51 -0800)]
Merge "Update JSDOMWindowBase to reflect recent upstreaming"

13 years agoFix mlb shopping site not drawing correctly.
Patrick Scott [Tue, 4 Jan 2011 15:20:10 +0000 (10:20 -0500)]
Fix mlb shopping site not drawing correctly.

Return false in hasOverflowScroll if flattening is on.

Bug: 3309139
Change-Id: Ia4c981fab26154a38e66412d7e2938da32e7d718

13 years agoUpdate JSDOMWindowBase to reflect recent upstreaming
Steve Block [Fri, 31 Dec 2010 13:19:41 +0000 (13:19 +0000)]
Update JSDOMWindowBase to reflect recent upstreaming

An Android-specific modification was upstreamed in
http://trac.webkit.org/changeset/74806

Bug: 3305994
Change-Id: Ie43475aa611259d2d2de39397e167e42b24434f3

13 years agoMerge "A WAR to get content showing up when GL enabled"
Teng-Hui Zhu [Wed, 29 Dec 2010 17:53:03 +0000 (09:53 -0800)]
Merge "A WAR to get content showing up when GL enabled"

13 years agoA WAR to get content showing up when GL enabled
Teng-Hui Zhu [Tue, 28 Dec 2010 23:27:13 +0000 (15:27 -0800)]
A WAR to get content showing up when GL enabled

The emptiness check is not optimal for GL rendering yet.
That cause some content are not showing up when GL enabled.

A WAR is to just update the textures and use them without
emptiness check.

bug: 3296986
Change-Id: I5087dbc34b744ffbe24f4a4a6616f4d5715e1f11

13 years agojoin rects without gaps
Cary Clark [Tue, 28 Dec 2010 14:23:04 +0000 (09:23 -0500)]
join rects without gaps

While analyzing cursor rings, regions are built from text,
rects, and bitmaps to determine the areas inside and outside
the rings. These areas determine if the rings are fully visible,
and if they can be expanded into a larger bounds.

Empty input areas are defined only by rects drawn as their
background. In general, rects may be drawn as pieces that need
to be stitched together. Unlike glyphs, the stitching should
not allow gaps between rects.

By detecting gaps, and treating each unjoined rect as its own
area, a page with multiple successive input fields correctly
computes cursor rect bounds.

bug:3116242
Change-Id: If702b692c99c96c0188b42a638f750da12af6df4

13 years agoMerge "use text slop for ring test"
Cary Clark [Thu, 23 Dec 2010 20:04:20 +0000 (12:04 -0800)]
Merge "use text slop for ring test"

13 years agouse text slop for ring test
Cary Clark [Thu, 23 Dec 2010 19:47:34 +0000 (14:47 -0500)]
use text slop for ring test

The mTextSlop contains the cursor ring test area.
The mTestBounds contains the total test area.

Use the former when checking to see if text is
drawn outside of the cursor rings, but inside
the bounds.

bug:3307120
Change-Id: Ice69ce3d70aabb435890a0fd8848ef3fe2de9796

13 years agoMerge WebKit at r73109: put correct ordering at Makefile.
Shimeng (Simon) Wang [Thu, 23 Dec 2010 18:58:40 +0000 (10:58 -0800)]
Merge WebKit at r73109: put correct ordering at Makefile.

Change-Id: I8953ea3eb6e78548c50953495cf688feaf9a8385

13 years agoCherry-pick WebKit change 60729 to avoid an AppCache crash - DO NOT MERGE
Steve Block [Thu, 23 Dec 2010 17:35:15 +0000 (17:35 +0000)]
Cherry-pick WebKit change 60729 to avoid an AppCache crash - DO NOT MERGE

This was observed when the AppCache database path was not set and hence
opening the database failed.

This change has already been pulled into master as part of the regular WebKit
merge process, so do not merge.

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

Bug: 3305684
Change-Id: I5707839a9b0f886a24604f890ca4d575e311edbe

13 years agoMerge Webkit at r73109: render frame docWidth/docHeight method changed.
Shimeng (Simon) Wang [Thu, 9 Dec 2010 02:50:49 +0000 (18:50 -0800)]
Merge Webkit at r73109: render frame docWidth/docHeight method changed.

Change-Id: I492d321eea76f2d2c5278e44ae9c2fe37b5834a6
See:
http://trac.webkit.org/changeset/72852
http://trac.webkit.org/changeset/73063

13 years agoMerge Webkit at r73109: Fix Makefiles.
Shimeng (Simon) Wang [Thu, 9 Dec 2010 01:48:05 +0000 (17:48 -0800)]
Merge Webkit at r73109: Fix Makefiles.

Change-Id: If8cc4cfc06399c67b08cf5157852de90876c3d55

13 years agoMerge Webkit at r73109: Fix conflicts
Shimeng (Simon) Wang [Wed, 8 Dec 2010 19:32:25 +0000 (11:32 -0800)]
Merge Webkit at r73109: Fix conflicts

1. WebCore/Android.jscbindings.mk
http://trac.webkit.org/changeset/72590
http://trac.webkit.org/changeset/72344

2. WebCore/WebCore.vcproj/WebCore.vcproj
too many changes between 72274 and 73109
http://trac.webkit.org/log/trunk/WebCore/WebCore.vcproj/WebCore.vcproj
also due to Android change.
https://android-git.corp.google.com/g/#change,37374

3. WebCore/platform/android/PlatformBridge.h
http://trac.webkit.org/changeset/72631

4. WebCore/rendering/RenderSVGResourceSolidColor.cpp
http://trac.webkit.org/changeset/72926
our code is not upstreamed

5. WebCore/rendering/RenderView.h
http://trac.webkit.org/changeset/72852
http://trac.webkit.org/changeset/73063

Change-Id: Id7a1dbdfef6327b4fe08c9884122bf9decd039ca

13 years agoMerge WebKit at r73109: return true to support rich source info.
Shimeng (Simon) Wang [Wed, 22 Dec 2010 18:07:38 +0000 (10:07 -0800)]
Merge WebKit at r73109: return true to support rich source info.

This is because:
http://trac.webkit.org/changeset/72360
which disables line info except in case of enabling JS debugger or inpspector.

This is a quick fix.  Long term solution is to get this fixed upstream.

Change-Id: Ibc5dd89719628848ab4710fcc7c06453b60cc119

13 years agoMerge WebKit at r73109: Fix V8 JNI binding.
Shimeng (Simon) Wang [Thu, 16 Dec 2010 21:47:51 +0000 (13:47 -0800)]
Merge WebKit at r73109: Fix V8 JNI binding.

cherry pick the change for webkit bug:
https://bugs.webkit.org/show_bug.cgi?id=51156

And fix array bindings.

Change-Id: I64b89fadd10ac87fa998a79b2af4aa9db07a8318

13 years agoMerge WebKit at r73109: Update WebKit revision number.
Shimeng (Simon) Wang [Thu, 9 Dec 2010 22:48:17 +0000 (14:48 -0800)]
Merge WebKit at r73109: Update WebKit revision number.

Change-Id: I1748e24000110d5c667f729c25131d5e624de41f