OSDN Git Service

android-x86/external-webkit.git
14 years agoam 939d1819: am 9d4701f9: Push a local reference frame to avoid table overflow.
Patrick Scott [Thu, 1 Jul 2010 18:55:49 +0000 (11:55 -0700)]
am 939d1819: am 9d4701f9: Push a local reference frame to avoid table overflow.

Merge commit '939d1819c550af9e179aa2fa46668206333e1ebc'

* commit '939d1819c550af9e179aa2fa46668206333e1ebc':
  Push a local reference frame to avoid table overflow.

14 years agoMerge "Bug2790521 - complex script overlap issue."
claireho [Thu, 1 Jul 2010 15:56:15 +0000 (08:56 -0700)]
Merge "Bug2790521 - complex script overlap issue."

14 years agoMerge "Clean up FEATURE_DEFINES in V8 generated sources Makefile"
Steve Block [Thu, 1 Jul 2010 15:41:43 +0000 (08:41 -0700)]
Merge "Clean up FEATURE_DEFINES in V8 generated sources Makefile"

14 years agoam 9d4701f9: Push a local reference frame to avoid table overflow.
Patrick Scott [Thu, 1 Jul 2010 11:59:04 +0000 (04:59 -0700)]
am 9d4701f9: Push a local reference frame to avoid table overflow.

Merge commit '9d4701f9dc3d6fec15813f6ff9da0ae2611aa4be' into gingerbread

* commit '9d4701f9dc3d6fec15813f6ff9da0ae2611aa4be':
  Push a local reference frame to avoid table overflow.

14 years agoClean up FEATURE_DEFINES in V8 generated sources Makefile
Steve Block [Thu, 1 Jul 2010 11:37:35 +0000 (12:37 +0100)]
Clean up FEATURE_DEFINES in V8 generated sources Makefile

The define V8_BINDING is intended to be on a line on its own to allow the
other defines on the line above to be identical between JSC and V8.

Change-Id: I278a135ba3f205283ae66f8ef1ff58fd139c4687

14 years agoMerge "Pass the WebView context to the GeolocationService from WebKit"
Steve Block [Thu, 1 Jul 2010 09:18:21 +0000 (02:18 -0700)]
Merge "Pass the WebView context to the GeolocationService from WebKit"

14 years agoBug2790521 - complex script overlap issue.
claireho [Wed, 30 Jun 2010 23:00:48 +0000 (16:00 -0700)]
Bug2790521 - complex script overlap issue.

Applied the fixes for complex script overlap for webkit/Chrome to
webkit/Android.

Change-Id: I4e34e36230b832524d7b8e78406de1e4c8438cf1

14 years agoMerge "Remove the double traversal in GraphicsLayerAndroid, so we should draw much...
Grace Kloba [Wed, 30 Jun 2010 22:31:33 +0000 (15:31 -0700)]
Merge "Remove the double traversal in GraphicsLayerAndroid, so we should draw much less now."

14 years agoRemove the double traversal in GraphicsLayerAndroid,
Grace Kloba [Tue, 29 Jun 2010 23:31:27 +0000 (16:31 -0700)]
Remove the double traversal in GraphicsLayerAndroid,
so we should draw much less now.

As we use Picture instead of PictureSet, ignore the
m_invalidatedRects for now. This should also reduce
the number of draws when m_invalidatedRects has more
than one rect.

14 years agoDetect if we're a webapp from the meta tag and send a message through
Ben Murdoch [Wed, 23 Jun 2010 18:56:02 +0000 (19:56 +0100)]
Detect if we're a webapp from the meta tag and send a message through
to java land if that is the case.

Requires a frameworks/base change.

b/2766917

Change-Id: I6d4034e6316e27c31a36a06063b5968c654fc756

14 years agoPush a local reference frame to avoid table overflow.
Patrick Scott [Tue, 29 Jun 2010 19:55:10 +0000 (15:55 -0400)]
Push a local reference frame to avoid table overflow.

Similar to jsc's implementation, this is needed to restrict the
amount of local references in a given jni frame.  Once the frame is
popped from the stack, all local references are cleaned.

Bug: 2807132
Change-Id: I5f4153509c513bec142472927a1787869a57f530

14 years agoMerge "refine text selection"
Cary Clark [Tue, 29 Jun 2010 18:36:19 +0000 (11:36 -0700)]
Merge "refine text selection"

14 years agorefine text selection
Cary Clark [Tue, 29 Jun 2010 18:11:45 +0000 (14:11 -0400)]
refine text selection

Change 'select all' to begin with the first character and end
with the last rather than relying on the top left and bottom
right. The old algorithm failed for pages broken into multiple
columns.

Similarly, capture the text from the beginning selection to the
ending selection, rather than relying on the characters contained
by the selection region.

Reduce the gap required to add a linebreak from twice the
lineheight to 1.5x the lineheight.

Change-Id: Ib90a719ea3353feeaa3a6cc692d0dd9cff498cb5
http://b/262451

14 years agoset maximum image size
Cary Clark [Fri, 25 Jun 2010 15:27:47 +0000 (11:27 -0400)]
set maximum image size

Our use of web settings does not specify the maximum image size,
although we have some hard-coded values used when decoding the
image. For defective images, the hard-coded values are not enough,
since we may exceed memory in the decoder before the limit is
reached.

Pass along our limits to the decoder, and respect any limits
set by the caller.

companion change in frameworks/base

Change-Id: Icdfca87a44a3af8bcc1f0ed4792e04e060a67333
http://b/2689053

14 years agoPass the WebView context to the GeolocationService from WebKit
Steve Block [Mon, 28 Jun 2010 09:25:04 +0000 (10:25 +0100)]
Pass the WebView context to the GeolocationService from WebKit

Bug: 2798745
Change-Id: I429a1cb9fc6826419c62f1f30376692ede497085

14 years agoMerge "Don't use the validity of the border color to determine whether the border...
Leon Clarke [Mon, 28 Jun 2010 12:36:49 +0000 (05:36 -0700)]
Merge "Don't use the validity of the border color to determine whether the border will be drawn, but instead use the appearance, which is effectively what webkit uses to decide whether to draw its border b/issue?id=2661748"

14 years agoRefactor find and select dialogs
Cary Clark [Fri, 4 Jun 2010 20:40:26 +0000 (16:40 -0400)]
Refactor find and select dialogs

SelectText now permits incremental extension of the selection
using either touch or trackball data. SelectText adds word selection
and select all interfaces.

SelectText has been rewritten to do a better job of finding space
characters and selecting text outside of the visible window.

Companion changes in frameworks/base and packages/apps/Browser

Change-Id: I917a14124a41a3c9bd72ffa48fe36e55e7c4e543
http://b/2626451

14 years agoMerge "Check "email" input as some sites use it as the username."
Grace Kloba [Thu, 24 Jun 2010 03:36:24 +0000 (20:36 -0700)]
Merge "Check "email" input as some sites use it as the username."

14 years agoCheck "email" input as some sites use it as the username.
Grace Kloba [Wed, 23 Jun 2010 23:57:41 +0000 (16:57 -0700)]
Check "email" input as some sites use it as the username.

Fix http://b/issue?id=2792508

14 years agoDon't use the validity of the border color to determine
Leon Clarke [Mon, 14 Jun 2010 13:06:03 +0000 (14:06 +0100)]
Don't use the validity of the border color to determine
whether the border will be drawn, but instead use the appearance,
which is effectively what webkit uses to decide whether to draw its border
http://b/issue?id=2661748

Change-Id: I8200f9e1ae68c1e16360bab25a0c7e6b0fe9ee34

14 years agoDon't dereference the frame when there isn't one in rel=apple-touch-icon links
Leon Clarke [Wed, 23 Jun 2010 13:30:10 +0000 (14:30 +0100)]
Don't dereference the frame when there isn't one in rel=apple-touch-icon links
http://b/issue?id=2789499

Change-Id: I392825d357057c02cd379228fcfaa23ff7616378

14 years agoMerge "Added setXSSAuditorEnabled support in WebSettings."
Shimeng (Simon) Wang [Tue, 22 Jun 2010 21:54:55 +0000 (14:54 -0700)]
Merge "Added setXSSAuditorEnabled support in WebSettings."

14 years agoAdded setXSSAuditorEnabled support in WebSettings.
Elliott Slaughter [Tue, 22 Jun 2010 18:34:35 +0000 (11:34 -0700)]
Added setXSSAuditorEnabled support in WebSettings.

Change-Id: I5a2580314ef866d661c6a1cac08df28ea1e0b54a

14 years agoMerge "Enable complex scripts support compiling by deafult."
claireho [Tue, 22 Jun 2010 17:56:07 +0000 (10:56 -0700)]
Merge "Enable complex scripts support compiling by deafult."

14 years agoEnable complex scripts support compiling by deafult.
claireho [Tue, 22 Jun 2010 16:36:24 +0000 (09:36 -0700)]
Enable complex scripts support compiling by deafult.

Change-Id: Iba6b9cb70bfb642467afe9dae3efa51829dc9d06

14 years agoFix for b/2786464
Ben Murdoch [Tue, 22 Jun 2010 15:44:09 +0000 (16:44 +0100)]
Fix for b/2786464

Some renderobjects are "anonymous", i.e. have the document node associated with them and in this case
the node() function returns null. We were then using the null RefPtr, hence the crash. RenderListMarker
is an example of such an anonymous node which is why websites that use lists exposed the crash.

Change-Id: I1a5527c42d99bbe8418b0e7bce4f3c245276e058

14 years agoMerge "Dump child frames data according to Mac/Qt implementation for layout tests."
Shimeng (Simon) Wang [Mon, 21 Jun 2010 16:56:13 +0000 (09:56 -0700)]
Merge "Dump child frames data according to Mac/Qt implementation for layout tests."

14 years agoDump child frames data according to Mac/Qt implementation for layout tests.
Shimeng (Simon) Wang [Thu, 17 Jun 2010 16:26:44 +0000 (09:26 -0700)]
Dump child frames data according to Mac/Qt implementation for layout tests.

Change-Id: I79bf09b1064d0d21540f492070f9b8a1ded83907

14 years agoMerge "Support complex scripts by calling Harfbuzz APIs. Ported the Chrome complex...
claireho [Mon, 21 Jun 2010 16:47:58 +0000 (09:47 -0700)]
Merge "Support complex scripts by calling Harfbuzz APIs. Ported the Chrome complex script suppport to Android. The Harfbuzz libary is built optionally. If the Harfbuzz is not included, we swicth back to default webkit complex script logic - it does not work correctly, but at least webkit won't be crash."

14 years agoMerge "Initial messaging model for project 'smoke'"
Patrick Scott [Mon, 21 Jun 2010 14:34:02 +0000 (07:34 -0700)]
Merge "Initial messaging model for project 'smoke'"

14 years agoInitial messaging model for project 'smoke'
Patrick Scott [Wed, 16 Jun 2010 15:34:35 +0000 (11:34 -0400)]
Initial messaging model for project 'smoke'

Not compiled yet as it is unused (without other patches).  I wanted
to start getting something committed so Derek and I can work together
on the next part.

Change-Id: I5dba6107e572c9be402d75df49c3c69e2c527590

14 years agoSupport complex scripts by calling Harfbuzz APIs.
claireho [Tue, 15 Jun 2010 20:14:09 +0000 (13:14 -0700)]
Support complex scripts by calling Harfbuzz APIs.
Ported the Chrome complex script suppport to Android.
The Harfbuzz libary is built optionally. If the Harfbuzz is not
included, we swicth back to default webkit complex script logic -
it does not work correctly, but at least webkit won't be crash.

Change-Id: I53cd81c82cc4c6a550bcc0f4fe5870f641a881ac

14 years agoFix layout test crash: fast/replaced/frame-removed-during-resize.html
Ben Murdoch [Fri, 18 Jun 2010 15:15:07 +0000 (16:15 +0100)]
Fix layout test crash: fast/replaced/frame-removed-during-resize.html

Fix b/2780565

Change-Id: I4956206dfbfaebd44414adaea7ab80e2c2fd4d1b

14 years agoFix new LayoutTest crashes in compositing/iframes/lots-of-objects.html and
Ben Murdoch [Thu, 17 Jun 2010 10:21:10 +0000 (11:21 +0100)]
Fix new LayoutTest crashes in compositing/iframes/lots-of-objects.html and
compositing/iframes/lots-of-iframes.html caused by memory leaks.

Change-Id: I28de673d5bf0bb79438af4f094e0390c48bd8180

14 years agoMerge webkit.org at r61121: Update WebKit revision number.
Ben Murdoch [Wed, 16 Jun 2010 14:03:22 +0000 (15:03 +0100)]
Merge webkit.org at r61121: Update WebKit revision number.

Change-Id: Ie4beb3ae65c015eb6116357326e38759476bad3c

14 years agoMerge webkit.org at r61121: Update LayoutTest expectations.
Ben Murdoch [Wed, 16 Jun 2010 15:30:59 +0000 (16:30 +0100)]
Merge webkit.org at r61121: Update LayoutTest expectations.

Change-Id: I0730b5799c10408e17c2e60f95be21145e19dd18

14 years agoMerge webkit.org at r61121: Build fix for break introduced by r57505.
Ben Murdoch [Wed, 16 Jun 2010 12:44:26 +0000 (13:44 +0100)]
Merge webkit.org at r61121: Build fix for break introduced by r57505.
    r60568 means we now need to build V8ConsoleCustom.cpp. This should be upstreamed.
    See http://trac.webkit.org/changeset/57505 and http://trac.webkit.org/changeset/60568

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

Change-Id: I354138014179b405ffb269adc012952e2d9cbb5e

14 years agoMerge webkit.org at r61121: Add ImageSource::getHotSpot() to our port. See http:...
Ben Murdoch [Wed, 16 Jun 2010 11:23:55 +0000 (12:23 +0100)]
Merge webkit.org at r61121: Add ImageSource::getHotSpot() to our port. See trac.webkit.org/changeset/60849

Change-Id: Ic61eecd845229cdf69090e24718b1363844440da

14 years agoMerge webkit.org at r61121: Fix build break introduced by r60689. This needs to be...
Ben Murdoch [Wed, 16 Jun 2010 11:19:28 +0000 (12:19 +0100)]
Merge webkit.org at r61121: Fix build break introduced by r60689. This needs to be upstreamed. See trac.webkit.org/changeset/60689

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

Change-Id: I825e3f3ff7be9b48c4a5ad9e11d2bfbdef6ad29e

14 years agoMerge webkit.org at r61121: Update GraphicsContext::setShadow() parameters in our...
Ben Murdoch [Wed, 16 Jun 2010 11:09:15 +0000 (12:09 +0100)]
Merge webkit.org at r61121: Update GraphicsContext::setShadow() parameters in our port. See trac.webkit.org/changeset/60961

Change-Id: Iad1feb4849e8bb029575692c227e6a49bcec679b

14 years agoMerge webkit.org at r61121: Update ImageBuffer::toDataURL() parameters in our port...
Ben Murdoch [Wed, 16 Jun 2010 11:04:03 +0000 (12:04 +0100)]
Merge webkit.org at r61121: Update ImageBuffer::toDataURL() parameters in our port. See trac.webkit.org/changeset/60675

Change-Id: I42bd49b720616625daab67c5ec8c54935e921ae3

14 years agoMerge webkit.org at r61121: Update derived makefiles after upstream refactor. See...
Ben Murdoch [Wed, 16 Jun 2010 11:00:23 +0000 (12:00 +0100)]
Merge webkit.org at r61121: Update derived makefiles after upstream refactor. See trac.webkit.org/changeset/61091

Change-Id: I24baf3a05540751941d908450caabe228e51a137

14 years agoMerge webkit.org at r61121: Add new method to InspectorClientAndroid. See http:/...
Ben Murdoch [Tue, 15 Jun 2010 20:00:12 +0000 (21:00 +0100)]
Merge webkit.org at r61121: Add new method to InspectorClientAndroid. See trac.webkit.org/changeset/61113

Change-Id: Id1f70698f67122742953867f3884f37ec06bae14

14 years agoMerge webkit.org at r61121: Add forward declaration instead of include, as the conten...
Ben Murdoch [Tue, 15 Jun 2010 19:50:37 +0000 (20:50 +0100)]
Merge webkit.org at r61121: Add forward declaration instead of include, as the content of the included is guarded out. This needs to be upstreamed.

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

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

Change-Id: I12d4dc5030b1cd86af554845cfebb7c61d194e47

14 years agoMerge webkit.org at r61121: Fix Makefiles.
Ben Murdoch [Tue, 15 Jun 2010 19:31:57 +0000 (20:31 +0100)]
Merge webkit.org at r61121: Fix Makefiles.

Change-Id: Ief303a7cc7e10561e016ffe7b737dc94cc852a61

14 years agoMerge webkit.org at r61121: Fix conflicts.
Ben Murdoch [Tue, 15 Jun 2010 18:52:12 +0000 (19:52 +0100)]
Merge webkit.org at r61121: Fix conflicts.

Fix conflicts due to addition of m_pageinateDuringLayoutEnabled in Settings.cpp|h
See http://trac.webkit.org/changeset/60509

Fix conflicts in ImageSource.h due to new functions being added in the same spot as an un upstreamed Android addition.
See http://trac.webkit.org/changeset/60927

Fix conflicts due to addition of !PLATFORM(CAIRO) to guard Android has changed and not upstreamed.
See http://trac.webkit.org/changeset/60760

Fix conflicts due to a variable renaming colliding with an Android ifdef which is not upstream.
See http://trac.webkit.org/changeset/61106

Fix conflicts due to Android IDB makefile fix collising with addition of new IDB file.
See http://trac.webkit.org/changeset/61120

Fix conflicts due to un-upstreamed makefile edits colliding with an upstream change.
See http://trac.webkit.org/changeset/61000

Change-Id: I330e08850b96d7c9fb1d093663c5847b9140683d

14 years agoMerge webkit.org at r61121: Initial merge by git.
Ben Murdoch [Tue, 15 Jun 2010 18:36:43 +0000 (19:36 +0100)]
Merge webkit.org at r61121: Initial merge by git.

Change-Id: Icd6db395c62285be384d137164d95d7466c98760

14 years agoRemove linker workaround after fixing linker.
Doug Kwan [Wed, 16 Jun 2010 00:59:39 +0000 (17:59 -0700)]
Remove linker workaround after fixing linker.

Change-Id: Ic840b9f915577fc74d6dc29efc7a7ebfd6402069

14 years agoDo not specify some IDB files twice in the JSC derived bindings makefile.
Ben Murdoch [Mon, 14 Jun 2010 15:01:30 +0000 (16:01 +0100)]
Do not specify some IDB files twice in the JSC derived bindings makefile.

Fix b/2763798.

Change-Id: I419c85d9a12e6555317f4eace039a85ce3f0aec9

14 years agoMerge "Remove a temporary Android-specific hack added to avoid a problem with ScriptD...
Steve Block [Fri, 11 Jun 2010 09:25:15 +0000 (02:25 -0700)]
Merge "Remove a temporary Android-specific hack added to avoid a problem with ScriptDebugServer::topStackFrame()"

14 years agoMerge "Cherry-pick WebKit change r60069 to fix a leak in Geolocation"
Steve Block [Thu, 10 Jun 2010 16:58:10 +0000 (09:58 -0700)]
Merge "Cherry-pick WebKit change r60069 to fix a leak in Geolocation"

14 years agoCherry-pick WebKit change 40290 to fix V8 bindings generator
Leon Clarke [Thu, 10 Jun 2010 15:46:56 +0000 (16:46 +0100)]
Cherry-pick WebKit change 40290 to fix V8 bindings generator
https://bugs.webkit.org/show_bug.cgi?id=40290
and remove the hack of including V8Proxy.h via V8CustomVoidCallback.h

Change-Id: I5e3a2aca573d4fa196e5db68514adf5dddfa39b5

14 years agoCherry-pick WebKit change r60069 to fix a leak in Geolocation
Steve Block [Wed, 9 Jun 2010 10:21:20 +0000 (11:21 +0100)]
Cherry-pick WebKit change r60069 to fix a leak in Geolocation

This change was made as a fix for Bug https://bugs.webkit.org/show_bug.cgi?id=39288
but was later rolled back in r60441 pending further discussion.

We need this fix, so cherry-pick it to Android until
https://bugs.webkit.org/show_bug.cgi?id=39288 is fixed properly.

Change-Id: Ie5cc610b841798e42ec1232b4af7674ce425b2c4

14 years agoRemove a temporary Android-specific hack added to avoid a problem with ScriptDebugSer...
Steve Block [Tue, 8 Jun 2010 20:48:45 +0000 (21:48 +0100)]
Remove a temporary Android-specific hack added to avoid a problem with ScriptDebugServer::topStackFrame()

Change https://android-git.corp.google.com/g/50673 introduced a temporary fix to avoid calling
ScriptDebugServer::topStackFrame(). This was required while WebKit Bug
https://bugs.webkit.org/show_bug.cgi?id=37502 was being fixed.

The fix for this bug was committed in WebKit r60083 so we can now remove the hack.

See also https://bugs.webkit.org/show_bug.cgi?id=38531

Change-Id: I1e26e71637faeec5c5806b7792a89a7fa63737d3

14 years agoFix build.
Andy McFadden [Tue, 8 Jun 2010 20:10:33 +0000 (13:10 -0700)]
Fix build.

Fix build by bracketing use of --stub-group-size with "!sim".

Change-Id: I910dd80f743f22bae56e6329ad52f0889a73514a

14 years agoMerge webkit.org at r60469 : Fix JSC build break
Leon Clarke [Tue, 8 Jun 2010 15:06:53 +0000 (16:06 +0100)]
Merge webkit.org at r60469 : Fix JSC build break
Custom bindings signatures have changed in JSC following this change
http://trac.webkit.org/changeset/60392
so isApplicationInstalled (which isn't upstreamed) needs to be updated to match the new style.

Change-Id: I7e837d61cdc7d4e5a4cd294c11e6ad4d827d5a2a

14 years agoMerge webkit.org at r60469 : Update WebKit revision
Leon Clarke [Fri, 4 Jun 2010 10:15:15 +0000 (11:15 +0100)]
Merge webkit.org at r60469 : Update WebKit revision

Change-Id: I2dd84902068301e0037b361d0191711bb57afbdd

14 years agoMerge webkit.org at r60469 : Cherry pick of makefile fix from webkit change 60777
Leon Clarke [Fri, 4 Jun 2010 16:20:59 +0000 (17:20 +0100)]
Merge webkit.org at r60469 : Cherry pick of makefile fix from webkit change 60777
http://trac.webkit.org/changeset/60777

Change-Id: If7a0c263b6ea24898e219f4b59416add2c52dcca

14 years agoMerge webkit.org at r60469 : Make generated bindings code compile
Leon Clarke [Fri, 4 Jun 2010 09:18:00 +0000 (10:18 +0100)]
Merge webkit.org at r60469 : Make generated bindings code compile

Change-Id: Ib2ec92fa65ee46f3c76093d9ff6b6eb18f863736

14 years agoMerge webkit.org at r60469 : since @60104 the zoom level functions ar in the FrameView
Leon Clarke [Thu, 3 Jun 2010 16:53:38 +0000 (17:53 +0100)]
Merge webkit.org at r60469 : since @60104 the zoom level functions ar in the FrameView
http://trac.webkit.org/changeset/60104

Change-Id: I7050bd945d397552bd154490277881cb4cc961c9

14 years agoMerge webkit.org at r60469 : @60418 requires us to use associatedElements() accessor...
Leon Clarke [Thu, 3 Jun 2010 16:10:10 +0000 (17:10 +0100)]
Merge webkit.org at r60469 : @60418 requires us to use associatedElements() accessor instead of accessing members
http://trac.webkit.org/changeset/60418

Change-Id: I6f50f6ba29c48a7628452af35dcd1269e090cff2

14 years agoMerge webkit.org at r60469 : friend needed after @60361 made many things private
Leon Clarke [Thu, 3 Jun 2010 16:08:22 +0000 (17:08 +0100)]
Merge webkit.org at r60469 : friend needed after @60361 made many things private
http://trac.webkit.org/changeset/60361

These changes are layering violations so should be removed before upstreaming.

Change-Id: I9ae45d9d0d8f4fa3a5cd1501f10b716be3a7dd85

14 years agoMerge webkit.org at r60469 : invokeCallback takes a ScriptExecutionContext following...
Leon Clarke [Thu, 3 Jun 2010 15:54:06 +0000 (16:54 +0100)]
Merge webkit.org at r60469 : invokeCallback takes a ScriptExecutionContext following @60330
http://trac.webkit.org/changeset/60330

Change-Id: I92e05b09e6cfc1703759b2c351e341a44b5eab0c

14 years agoMerge webkit.org at r60469 : Update our plugin code following refactor @60258
Leon Clarke [Thu, 3 Jun 2010 15:40:19 +0000 (16:40 +0100)]
Merge webkit.org at r60469 : Update our plugin code following refactor @60258
http://trac.webkit.org/changeset/60258

Change-Id: I7b1540d54286d6201f643eb729dbb5d66ff3226f

14 years agoMerge webkit.org at r60469 : toDataURL takes a quality hint since webkit @60458
Leon Clarke [Thu, 3 Jun 2010 15:15:49 +0000 (16:15 +0100)]
Merge webkit.org at r60469 : toDataURL takes a quality hint since webkit @60458
http://trac.webkit.org/changeset/60458

Change-Id: I8a7bc06b4a5b4157161a7bef3bbbebd600d511d4

14 years agoMerge webkit.org at r60469 : Fix Makefiles.
Leon Clarke [Thu, 3 Jun 2010 14:49:24 +0000 (15:49 +0100)]
Merge webkit.org at r60469 : Fix Makefiles.
Change-Id: Iaa99d053248875da694b806b913fe43922134cbb

14 years agoMerge webkit.org at r60469 : Fix conflicts.
Leon Clarke [Thu, 3 Jun 2010 14:40:26 +0000 (15:40 +0100)]
Merge webkit.org at r60469 : Fix conflicts.

The changes to DomWindow.cpp are needed by @60104 moving things from the frame to the FrameView
http://trac.webkit.org/changeset/60104

Change-Id: I8a7aa0478c2f0239bc52bb5078c446e5c8c84972

14 years agoMerge webkit.org at r60469 : Initial merge by git.
Leon Clarke [Thu, 3 Jun 2010 13:33:32 +0000 (14:33 +0100)]
Merge webkit.org at r60469 : Initial merge by git.

Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234

14 years agoWork around build problem caused by too many stubs in a stub group.
Doug Kwan [Fri, 4 Jun 2010 19:04:50 +0000 (12:04 -0700)]
Work around build problem caused by too many stubs in a stub group.

Change-Id: I7ec73e2379db205330deb3e612700e5295e0b4d4

14 years agoMerge "Fix platformVisibleContentRect() for the sub frame. The visibleBounds is only...
Grace Kloba [Fri, 4 Jun 2010 16:27:05 +0000 (09:27 -0700)]
Merge "Fix platformVisibleContentRect() for the sub frame. The visibleBounds is only set to the top frame. For sub frame, we need to intersect it with the sub frame's own bounds."

14 years agoFall back to old linker temporarily due to a bug in gold.
Doug Kwan [Fri, 4 Jun 2010 07:15:00 +0000 (00:15 -0700)]
Fall back to old linker temporarily due to a bug in gold.

Change-Id: Ibf6eb848238f37d52be7bd24760ee21dc9411e62

14 years agoFix platformVisibleContentRect() for the sub frame.
Grace Kloba [Thu, 3 Jun 2010 16:47:19 +0000 (09:47 -0700)]
Fix platformVisibleContentRect() for the sub frame.
The visibleBounds is only set to the top frame. For
sub frame, we need to intersect it with the sub frame's
own bounds.

Fix http://b/issue?id=2685194

14 years agoAdd indexeddb layout tests at 60074 in preparation for the new merge.
Leon Clarke [Thu, 3 Jun 2010 13:48:52 +0000 (14:48 +0100)]
Add indexeddb layout tests at 60074 in preparation for the new merge.
They won't work, but will be added to the skip list.

Change-Id: Iee37cfb4abcf7dd02ec83d482e87fdc057d5e308

14 years agoEnable File Reader and blob.slice APIs.
Ben Murdoch [Fri, 28 May 2010 10:08:34 +0000 (11:08 +0100)]
Enable File Reader and blob.slice APIs.

Notes:
- the change to WebCore/html/FileStream.cpp is a cherry pick of http://trac.webkit.org/changeset/60325
- the change to WebCore/platform/posix/FileSystemPOSIX.cpp is a cherry pick of http://trac.webkit.org/changeset/60374
- this needs a corresponding frameworks/base change

Change-Id: I05d1496e1e95adf1c6a61c6f07bbf62e9bc92820

14 years agoCode clean up, http://b/issue?id=2724743
Grace Kloba [Sat, 29 May 2010 01:06:43 +0000 (18:06 -0700)]
Code clean up, http://b/issue?id=2724743

Change Widget:screenWidth() to Widget:textWrapWidth()
as the text wrap width may be different than the
screen width after pinch zoom.

Change AndroidWebHistoryBridge's m_screenWidthScale
to m_textWrapScale to reflect its meaning.

Remove unused screenWidth/screenHeight in PlatformBridge.

Merge two restore methods to one. There is a matching
CL in framework/base.

Only setUseFixedLayout if layout width is different
than screen width.

Change from Node* to Ref<Node> to avoid a crash.
Fix http://b/issue?id=2660396

14 years agoUse the real visibleBounds for the ScrollView's
Grace Kloba [Fri, 28 May 2010 17:51:40 +0000 (10:51 -0700)]
Use the real visibleBounds for the ScrollView's
visibleContentRect.

Use the fixedLayout for the main FramView so that
the virtual viewport is set up correctly for the
css percent calculation.

Fix http://b/issue?id=2685194

14 years agoReport correct window.innerWidth and window.innerHeight.
Grace Kloba [Wed, 26 May 2010 19:27:41 +0000 (12:27 -0700)]
Report correct window.innerWidth and window.innerHeight.

I agree with this article that we should have a way
to report the visible viewport to the JavaScript.

http://www.quirksmode.org/mobile/viewports2.html#link6

Fix http://b/issue?id=2717861

I will try to upstream the code to WebKit separately.

14 years agoMerge "Fix popup window default size."
Grace Kloba [Thu, 27 May 2010 16:51:03 +0000 (09:51 -0700)]
Merge "Fix popup window default size."

14 years agoFix popup window default size.
Grace Kloba [Wed, 26 May 2010 23:24:10 +0000 (16:24 -0700)]
Fix popup window default size.

The change has been submitted to WebKit.
https://bugs.webkit.org/show_bug.cgi?id=39835

14 years agoAdded getTouchHighlightRects for the fat point.
Grace Kloba [Tue, 25 May 2010 04:54:49 +0000 (21:54 -0700)]
Added getTouchHighlightRects for the fat point.

There is another matching CL in framework/base.

14 years agoMerge WebKit at r60074: Update WEBKIT_MERGE_REVISION
Steve Block [Wed, 26 May 2010 10:30:57 +0000 (11:30 +0100)]
Merge WebKit at r60074: Update WEBKIT_MERGE_REVISION

Change-Id: I0d3f2bcfe262888ca1388b56c680d13e3b1f455c

14 years agoMerge WebKit at r60074: Update Android-specific expected LayoutTests results
Steve Block [Wed, 26 May 2010 13:10:43 +0000 (14:10 +0100)]
Merge WebKit at r60074: Update Android-specific expected LayoutTests results

Refactored Geolocation tests, see http://trac.webkit.org/changeset/59926
- android-v8/fast/dom/Geolocation/callback-exception-expected.txt

New Geolocation test, see http://trac.webkit.org/changeset/59859
- android-v8/fast/dom/Geolocation/notimer-after-unload-expected.txt

Change-Id: Ife6cd9850d0419adadf5813b17f4a2813090ff30

14 years agoMerge WebKit at r60074: Remove ANDROID_EXPOSE_COLUMN_GAP as RenderBlock::columnGap...
Steve Block [Wed, 26 May 2010 10:48:42 +0000 (11:48 +0100)]
Merge WebKit at r60074: Remove ANDROID_EXPOSE_COLUMN_GAP as RenderBlock::columnGap() is now public

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

Change-Id: I06ab20401e79c8b9c8104bb6a81c5891ef36d717

14 years agoMerge WebKit at r60074: RenderStyle color accessors are now private
Steve Block [Wed, 26 May 2010 10:26:00 +0000 (11:26 +0100)]
Merge WebKit at r60074: RenderStyle color accessors are now private

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

Change-Id: If1839f65ad960250c7dda5b565bd47278aa7df14

14 years agoMerge WebKit at r60074: Pass null DeviceOrientationClient to Page constructor
Steve Block [Wed, 26 May 2010 10:08:08 +0000 (11:08 +0100)]
Merge WebKit at r60074: Pass null DeviceOrientationClient to Page constructor

Change-Id: I0afccb0d08d42f13579ff7df4c41ed2d07abb36e

14 years agoMerge WebKit at r60074: Fix Android makefiles
Steve Block [Wed, 26 May 2010 10:33:23 +0000 (11:33 +0100)]
Merge WebKit at r60074: Fix Android makefiles

Change-Id: I549373cf00e9cc72060eccaf55e6a3efb0623df0

14 years agoMerge WebKit at r60074: Fix conflicts
Steve Block [Wed, 26 May 2010 09:20:32 +0000 (10:20 +0100)]
Merge WebKit at r60074: Fix conflicts

DeviceOrientation
- WebCore/Android.derived.jscbindings.mk
- WebCore/Android.derived.v8bindings.mk
- WebCore/page/Page.cpp

Trivial
- WebCore/css/CSSParser.cpp
- WebCore/page/Settings.cpp
- WebCore/page/Settings.h
- WebCore/rendering/style/RenderStyle.h

Code deletion - See http://trac.webkit.org/changeset/59749
- WebCore/html/HTMLTokenizer.cpp

PluginView JSC guards uspstreaming
- WebCore/plugins/PluginView.cpp
- WebCore/plugins/PluginView.h

Refactoring, see http://trac.webkit.org/changeset/59784
- WebCore/rendering/RenderLayer.cpp

RenderBlock::columnGap() and columnRects() are now public, see http://trac.webkit.org/changeset/59784
- WebCore/rendering/RenderBlock.h

Change-Id: I409c68d334d60c3854b4b0365c18e6f63884afa6

14 years agoMerge WebKit at r60074: Initial merge by git
Steve Block [Wed, 26 May 2010 09:11:43 +0000 (10:11 +0100)]
Merge WebKit at r60074: Initial merge by git

Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7

14 years agoMerge "Remove the unnecessary return keyword."
Shimeng (Simon) Wang [Wed, 26 May 2010 21:51:38 +0000 (14:51 -0700)]
Merge "Remove the unnecessary return keyword."

14 years agoRemove the unnecessary return keyword.
Shimeng (Simon) Wang [Wed, 26 May 2010 21:42:40 +0000 (14:42 -0700)]
Remove the unnecessary return keyword.

Change-Id: If55ba03f4c46afed544083263fbd6d3577807909

14 years agoMerge "Refix http://b/issue?id=2509597."
Grace Kloba [Wed, 26 May 2010 21:18:38 +0000 (14:18 -0700)]
Merge "Refix http://b/issue?id=2509597."

14 years agoRefix http://b/issue?id=2509597.
Grace Kloba [Tue, 25 May 2010 05:27:34 +0000 (22:27 -0700)]
Refix http://b/issue?id=2509597.

Instead of changing the screenRect for the Screen
object, change createWindow() logic to depend on the
WebCoreViewBridge width/height instead of Screen
as Screen is supposed to be in device pixel and it
is not proper to be used here. Update the comment
for the screenRect so that we won't mistakenly modify it.

Fix http://b/issue?id=2690479

14 years agoChoose right operator new/delete in case of multiple inheritance.
Shimeng (Simon) Wang [Wed, 26 May 2010 17:43:12 +0000 (10:43 -0700)]
Choose right operator new/delete in case of multiple inheritance.

Change-Id: I5ae0c7ad9e06021a8149b5b70fdb20a0f0a8f4d8

14 years agoMerge WebKit at r59636: Update WebKit version
Kristian Monsen [Tue, 25 May 2010 10:08:19 +0000 (11:08 +0100)]
Merge WebKit at r59636: Update WebKit version

Change-Id: I784830d55a5238da319e9487fd113d81b11b4735

14 years agoMerge "Merge WebKit at r59636: Variable changed to method upstream http://trac.webkit...
Kristian Monsen [Tue, 25 May 2010 15:00:42 +0000 (08:00 -0700)]
Merge "Merge WebKit at r59636: Variable changed to method upstream trac.webkit.org/changeset/59576/trunk/WebCore/loader/CachedResource.h#file0"

14 years agoMerge "Merge WebKit at r59636: Added header needed for Android"
Kristian Monsen [Tue, 25 May 2010 15:00:35 +0000 (08:00 -0700)]
Merge "Merge WebKit at r59636: Added header needed for Android"

14 years agoMerge "Merge WebKit at r59636: Method name changed upstream http://trac.webkit.org...
Kristian Monsen [Tue, 25 May 2010 15:00:30 +0000 (08:00 -0700)]
Merge "Merge WebKit at r59636: Method name changed upstream trac.webkit.org/changeset/59227/trunk/WebCore/html/HTMLLabelElement.h#file0"

14 years agoMerge changes I03b28d93,Ie53e458f
Kristian Monsen [Tue, 25 May 2010 15:00:24 +0000 (08:00 -0700)]
Merge changes I03b28d93,Ie53e458f

* changes:
  Merge WebKit at r59636: Fix Android ifdef, commas moved upstream. http://trac.webkit.org/changeset/59035/trunk/WebCore/bridge/npapi.h#file0
  Merge WebKit at r59636: Fix makefiles

14 years agoMerge "Merge WebKit at r59636: Fix conflicts"
Kristian Monsen [Tue, 25 May 2010 14:59:08 +0000 (07:59 -0700)]
Merge "Merge WebKit at r59636: Fix conflicts"

14 years agoMerge "Merge WebKit at r59636: Initial merge by git"
Kristian Monsen [Tue, 25 May 2010 14:58:57 +0000 (07:58 -0700)]
Merge "Merge WebKit at r59636: Initial merge by git"