OSDN Git Service
Steve Block [Thu, 8 Jul 2010 23:17:52 +0000 (00:17 +0100)]
Merge WebKit at r62496: Fix Makefiles
New files added in http://trac.webkit.org/changeset/62215
Change-Id: I8fd5b51f0c38396060fac61d64bc8d159e234a5d
Steve Block [Thu, 8 Jul 2010 12:18:23 +0000 (13:18 +0100)]
Merge WebKit at r62496: Fix conflicts
HTMLDocumentParser.cpp - Conflict due to Android instrumentation - http://trac.webkit.org/changeset/62033
FrameView.cpp - Conflict due to iframe flattening - http://trac.webkit.org/changeset/62135
Settings.cpp/h - Conflict due to Android plugins - http://trac.webkit.org/changeset/62284
DragData.h - Conflict due to Android special-case - http://trac.webkit.org/changeset/62124
RenderThemeAndroid.cpp/h - Conflict due to not-yet-upstreamed video - http://trac.webkit.org/changeset/62104
Change-Id: If5bd7bf0de525454166c3ccea050da55b29644c3
Steve Block [Thu, 8 Jul 2010 11:51:48 +0000 (12:51 +0100)]
Merge WebKit at r62496: Initial merge by git
Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
Steve Block [Fri, 9 Jul 2010 11:06:11 +0000 (12:06 +0100)]
Properly guard local changes for link prefetching
This fixes the WebKit build for PLATFORM(MAC)
Change-Id: Ic19e8840363bc1d42b569c3e732ee3ee4e92c00a
Shimeng (Simon) Wang [Thu, 8 Jul 2010 18:41:55 +0000 (11:41 -0700)]
Merge "Fix issue
2823805: let expanded iframe scroll."
Shimeng (Simon) Wang [Thu, 8 Jul 2010 18:15:02 +0000 (11:15 -0700)]
Fix issue
2823805: let expanded iframe scroll.
issue:
2823805
Change-Id: I39e24cd1359df0d0a44d7eee60a62a1990d74861
Kristian Monsen [Thu, 8 Jul 2010 10:49:34 +0000 (03:49 -0700)]
Merge "Merge WebKit at r61871: Update WEBKIT_MERGE_REVISION"
Kristian Monsen [Thu, 8 Jul 2010 09:59:28 +0000 (10:59 +0100)]
Merge WebKit at r61871: Update WEBKIT_MERGE_REVISION
Change-Id: Iccb0bd9a2908dda6310fa6543a5ae0018b40825b
Grace Kloba [Wed, 7 Jul 2010 17:34:21 +0000 (10:34 -0700)]
Merge "Enable composite layers for the sub frame."
Grace Kloba [Wed, 7 Jul 2010 17:28:13 +0000 (10:28 -0700)]
Enable composite layers for the sub frame.
Fix the visibleContentRect for iframe. It should be
relative to its parent instead of the viewport.
For fixed position, we still check for the top frame
as the current logic positions the object relative to
the screen which only applied to the top frame.
For plugin, it depends on PluginWidget's platformLayer().
The default is 0.
For video, it depends on MediaPlayer's supportsAcceleratedRendering().
The default is false.
Fix the crash in the GraphicsLayerAndroid. The root
layer is a container layer, there is no need to draw
them. As LayerAndroid doesn't create Picture for them,
we should ensure to skip draw.
Fix http://b/issue?id=
2733947
Steve Block [Wed, 7 Jul 2010 13:23:20 +0000 (06:23 -0700)]
Merge "Update JavaInstance to reflect final version upstreamed to WebKit"
Steve Block [Wed, 7 Jul 2010 10:58:25 +0000 (11:58 +0100)]
Update JavaInstance to reflect final version upstreamed to WebKit
See https://bugs.webkit.org/show_bug.cgi?id=41516
Bug:
2807132
Change-Id: I080978d1a6b90f2d8da1f62adbb62c60ef0034c9
Cary Clark [Fri, 2 Jul 2010 14:47:47 +0000 (07:47 -0700)]
Merge "don't walk off the end of the DOM when looking for text"
Cary Clark [Fri, 2 Jul 2010 14:35:08 +0000 (10:35 -0400)]
don't walk off the end of the DOM when looking for text
Also, fix a couple of minor changes in debugging code to
stay sync'd with webkit.
Change-Id: If4263bab97715e2a2d12f06f2359554740bf5dbc
http://b/
2816549
Kristian Monsen [Wed, 30 Jun 2010 18:13:28 +0000 (19:13 +0100)]
Merge WebKit at r61871: Update expected layout test.
The initial chromium expected matches what we see on android so using that.
http://trac.webkit.org/changeset/61352
Change-Id: Ie8dec2c650f45fe6c84884d800043b42897bc7bc
Kristian Monsen [Wed, 30 Jun 2010 19:53:48 +0000 (20:53 +0100)]
Merge WebKit at r61871: Refactoring of MimeClassInfo class.
http://trac.webkit.org/changeset/61168 String suffixes changed to Vector<String> extensions
http://trac.webkit.org/changeset/61150 pluginIndex removed
Change-Id: I8e81d95da1a6795beb94247102317cf9b449979f
Kristian Monsen [Wed, 30 Jun 2010 19:50:54 +0000 (20:50 +0100)]
Merge WebKit at r61871: Floating-point support for text selection.
http://trac.webkit.org/changeset/61253
Change-Id: If90b8c599f64c659436278c217d678a981db262f
Kristian Monsen [Wed, 30 Jun 2010 19:19:05 +0000 (20:19 +0100)]
Merge WebKit at r61871: Compile fix for PrintContext.cpp
http://trac.webkit.org/changeset/61232.
Not sure why it compiles on other platforms.
Change-Id: I6f109ebdb6069b00cefbb528a9d38cc3df0079f7
Kristian Monsen [Wed, 30 Jun 2010 19:23:58 +0000 (20:23 +0100)]
Merge WebKit at r61871: Fix conflicts in Frame.cpp
Code was moved from Frame.cpp, this created problems for local changes. Should be working again now (with more local changes).
http://trac.webkit.org/changeset/61217/trunk/WebCore/page/Frame.cpp
Change-Id: Ica56218eb972a1d0d311900efc1a2b3c609dae75
Kristian Monsen [Wed, 30 Jun 2010 18:48:55 +0000 (19:48 +0100)]
Merge WebKit at r61871: Fix conflicts in FrameLoader.cpp
Cleaing up of frameloader removed one of our local changes, this should fix it.
http://trac.webkit.org/changeset/61546
Change-Id: Ic0c08e8f944ab93b8a08f500042ce9fdeaa57238
Kristian Monsen [Wed, 30 Jun 2010 18:31:09 +0000 (19:31 +0100)]
Merge WebKit at r61871: Fix conflicts in HTMLDocumentParser.cpp
New document parser in webkit. Just taking in the new parser.
See http://trac.webkit.org/changeset/61674
This file is now what is in webkit at the time of the merge, with ANDROID_INSTRUMENT added.
The instrumentation for Parsing now includes inline script execution, this will have to be fixed later. Updated the
description for the parsing counter.
Change-Id: I2c1bae725fe8989999620430e4745e1dfa7c450b
Kristian Monsen [Wed, 30 Jun 2010 18:28:40 +0000 (19:28 +0100)]
Merge WebKit at r61871: Fix conflicts
V8Proxy.cpp
http://trac.webkit.org/changeset/61499
npapi.h:
http://trac.webkit.org/changeset/61277
Document.cpp
http://trac.webkit.org/changeset/61787
XMLDocumentParser.h:
http://trac.webkit.org/changeset/61663
HTMLLinkElement.*:
http://trac.webkit.org/changeset/61424
HTMLTableCellElement.cpp
http://trac.webkit.org/changeset/61630
ResourceHandleAndroid.cpp:
http://trac.webkit.org/changeset/61768
Change-Id: If991d3c112eeefd3098aa68b862c65798d505e1f
Kristian Monsen [Wed, 30 Jun 2010 18:09:38 +0000 (19:09 +0100)]
Merge WebKit at r61871: Update makefiles
Change-Id: I85e597beedb768af8d3cf4aa269ecdeb2af9a113
Kristian Monsen [Mon, 28 Jun 2010 15:42:48 +0000 (16:42 +0100)]
Merge WebKit at r61871: Initial merge by git.
Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
Doug Kwan [Thu, 1 Jul 2010 20:52:15 +0000 (13:52 -0700)]
Merge "Disable ICF for libwebcore.so"
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.
Doug Kwan [Thu, 1 Jul 2010 18:52:11 +0000 (11:52 -0700)]
Disable ICF for libwebcore.so
Change-Id: I314231a5f7d831f940b8cbc7c1d5bcd0fe09424e
claireho [Thu, 1 Jul 2010 15:56:15 +0000 (08:56 -0700)]
Merge "Bug2790521 - complex script overlap issue."
Steve Block [Thu, 1 Jul 2010 15:41:43 +0000 (08:41 -0700)]
Merge "Clean up FEATURE_DEFINES in V8 generated sources Makefile"
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.
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
Steve Block [Thu, 1 Jul 2010 09:18:21 +0000 (02:18 -0700)]
Merge "Pass the WebView context to the GeolocationService from WebKit"
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
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."
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.
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
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
Cary Clark [Tue, 29 Jun 2010 18:36:19 +0000 (11:36 -0700)]
Merge "refine 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
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
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
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"
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
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."
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
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
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
Shimeng (Simon) Wang [Tue, 22 Jun 2010 21:54:55 +0000 (14:54 -0700)]
Merge "Added 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
claireho [Tue, 22 Jun 2010 17:56:07 +0000 (10:56 -0700)]
Merge "Enable 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
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
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."
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
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."
Patrick Scott [Mon, 21 Jun 2010 14:34:02 +0000 (07:34 -0700)]
Merge "Initial 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
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
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
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
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
Ben Murdoch [Wed, 16 Jun 2010 15:30:59 +0000 (16:30 +0100)]
Merge webkit.org at r61121: Update LayoutTest expectations.
Change-Id: I0730b5799c10408e17c2e60f95be21145e19dd18
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
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
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
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
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
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
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
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
Ben Murdoch [Tue, 15 Jun 2010 19:31:57 +0000 (20:31 +0100)]
Merge webkit.org at r61121: Fix Makefiles.
Change-Id: Ief303a7cc7e10561e016ffe7b737dc94cc852a61
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
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
Doug Kwan [Wed, 16 Jun 2010 00:59:39 +0000 (17:59 -0700)]
Remove linker workaround after fixing linker.
Change-Id: Ic840b9f915577fc74d6dc29efc7a7ebfd6402069
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
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()"
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"
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
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
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
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
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
Leon Clarke [Fri, 4 Jun 2010 10:15:15 +0000 (11:15 +0100)]
Merge webkit.org at r60469 : Update WebKit revision
Change-Id: I2dd84902068301e0037b361d0191711bb57afbdd
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
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
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
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
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
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
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
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
Leon Clarke [Thu, 3 Jun 2010 14:49:24 +0000 (15:49 +0100)]
Merge webkit.org at r60469 : Fix Makefiles.
Change-Id: Iaa99d053248875da694b806b913fe43922134cbb
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
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
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
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."
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
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
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
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