OSDN Git Service
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
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
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
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
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.
Grace Kloba [Thu, 27 May 2010 16:51:03 +0000 (09:51 -0700)]
Merge "Fix 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
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.
Steve Block [Wed, 26 May 2010 10:30:57 +0000 (11:30 +0100)]
Merge WebKit at r60074: Update WEBKIT_MERGE_REVISION
Change-Id: I0d3f2bcfe262888ca1388b56c680d13e3b1f455c
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
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
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
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
Steve Block [Wed, 26 May 2010 10:33:23 +0000 (11:33 +0100)]
Merge WebKit at r60074: Fix Android makefiles
Change-Id: I549373cf00e9cc72060eccaf55e6a3efb0623df0
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
Steve Block [Wed, 26 May 2010 09:11:43 +0000 (10:11 +0100)]
Merge WebKit at r60074: Initial merge by git
Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
Shimeng (Simon) Wang [Wed, 26 May 2010 21:51:38 +0000 (14:51 -0700)]
Merge "Remove 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
Grace Kloba [Wed, 26 May 2010 21:18:38 +0000 (14:18 -0700)]
Merge "Refix 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
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
Kristian Monsen [Tue, 25 May 2010 10:08:19 +0000 (11:08 +0100)]
Merge WebKit at r59636: Update WebKit version
Change-Id: I784830d55a5238da319e9487fd113d81b11b4735
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"
Kristian Monsen [Tue, 25 May 2010 15:00:35 +0000 (08:00 -0700)]
Merge "Merge WebKit at r59636: Added header needed for Android"
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"
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
Kristian Monsen [Tue, 25 May 2010 14:59:08 +0000 (07:59 -0700)]
Merge "Merge WebKit at r59636: Fix conflicts"
Kristian Monsen [Tue, 25 May 2010 14:58:57 +0000 (07:58 -0700)]
Merge "Merge WebKit at r59636: Initial merge by git"
Patrick Scott [Fri, 21 May 2010 18:26:44 +0000 (14:26 -0400)]
Do not try to show pdf's in the browser.
We were skipping the canShowMIMEType check if content_disposition was non-empty.
That was causing us to treat an inline content disposition as if we could show
it in the browser. Instead, fallback to checking the mime type so we download
files that we can't natively show.
Bug:
2698159
Change-Id: I846dfea565bc4eeade9d679a0101a81858ef29cb
Kristian Monsen [Mon, 24 May 2010 17:18:47 +0000 (18:18 +0100)]
Merge WebKit at r59636: Variable changed to method upstream
http://trac.webkit.org/changeset/59576/trunk/WebCore/loader/CachedResource.h#file0
Change-Id: Icf2abd0e5983cd4c2188305889edec4e072e684e
Kristian Monsen [Mon, 24 May 2010 17:17:07 +0000 (18:17 +0100)]
Merge WebKit at r59636: Added header needed for Android
Change-Id: I15e893f845e1d4b0c15548350511e45eee35dbb1
Kristian Monsen [Mon, 24 May 2010 16:11:00 +0000 (17:11 +0100)]
Merge WebKit at r59636: Method name changed upstream
http://trac.webkit.org/changeset/59227/trunk/WebCore/html/HTMLLabelElement.h#file0
Change-Id: I78e259fde5c59c9fe84173abedc8ff3996142381
Kristian Monsen [Mon, 24 May 2010 16:09:42 +0000 (17:09 +0100)]
Merge WebKit at r59636: Fix Android ifdef, commas moved upstream.
http://trac.webkit.org/changeset/59035/trunk/WebCore/bridge/npapi.h#file0
Change-Id: I03b28d93e229f5a0f7dbc918c0234a549bb73071
Kristian Monsen [Mon, 24 May 2010 10:41:04 +0000 (11:41 +0100)]
Merge WebKit at r59636: Fix makefiles
Change-Id: Ie53e458fbec03234aeb3ba16ce4d90aa629d3575
Kristian Monsen [Fri, 21 May 2010 16:40:46 +0000 (17:40 +0100)]
Merge WebKit at r59636: Fix conflicts
Change-Id: If40295eb42282bace49d422e4a24026ddac17cfe
Kristian Monsen [Fri, 21 May 2010 15:53:46 +0000 (16:53 +0100)]
Merge WebKit at r59636: Initial merge by git
Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
Grace Kloba [Tue, 25 May 2010 04:45:32 +0000 (21:45 -0700)]
Merge "First draft to add a fat point to WebKit hit test."
Grace Kloba [Wed, 19 May 2010 04:59:53 +0000 (21:59 -0700)]
First draft to add a fat point to WebKit hit test.
If padding is 0, it is the old style point hit test.
If it finds a node, it will break the search loop
and return.
If padding is non-zero, the first node will be added
to HitTestResult's innerNode as before. But instead
of finishing the search, hit test will continue to
look for other nodes covered by the fat point unless
it is fully inside the current node.
Here are some highlights of the changes.
. instead of testing renderRect.contains(x, y),
we now test renderRect.intersect(pointRect)
. when a Node is hit, it will be appended to the
rawNodeList of HitTestResult. So the order inside
the rawNodeList represents the hit test order.
Currently the fat point doesn't support SVG nodes.
It also doesn't support overflow control yet.
Grace Kloba [Mon, 24 May 2010 16:18:48 +0000 (09:18 -0700)]
Only set extra_layout_delay if the loader is not
completed yet.
In some case, especially with iframe, we may get
the loader finished before first layout. In this
case, we should not set layout delay. Otherwise it
won't be cleared.
Fix http://b/issue?id=
2594662
Grace Kloba [Mon, 24 May 2010 16:07:53 +0000 (09:07 -0700)]
Merge "Fix a binding big in WebKit which prevents url hijacking for mobile adsense."
Grace Kloba [Fri, 21 May 2010 16:35:01 +0000 (09:35 -0700)]
Fix a binding big in WebKit which prevents url
hijacking for mobile adsense.
Fix http://b/issue?id=
2695688
cherry-pick the change from WebKit
https://bugs.webkit.org/show_bug.cgi?id=39452
Cary Clark [Mon, 24 May 2010 14:44:10 +0000 (10:44 -0400)]
implement Canvas.toDataURL
The Chrome implementation serves as the base for this code.
The test is at http://philip.html5.org/tests/canvas/suite/tests/index.toDataURL.html
Change-Id: I873518362793fbe1c99686fbe240cfe7c27d1493
http://b/
2620678
Cary Clark [Mon, 24 May 2010 14:30:03 +0000 (07:30 -0700)]
Merge "check for null on extremely large images"
Cary Clark [Mon, 24 May 2010 14:18:52 +0000 (10:18 -0400)]
check for null on extremely large images
The new PrivateAndroidImageSourceRec allocator may return null
if the image sizes are extremely large. Check for this to avoid
a null deference.
Change-Id: Ia129a87a1794a2696a4e1e415a940ac2b6b50064
http://b/
2689053
Steve Block [Mon, 24 May 2010 11:40:14 +0000 (04:40 -0700)]
Merge "Cherry-pick WebKit change 59918 to fix Java bridge for JSC"
Steve Block [Mon, 24 May 2010 11:29:35 +0000 (04:29 -0700)]
Merge "Update Android to reflect upstreamed code to avoid Geolocation leaks"
Steve Block [Wed, 12 May 2010 12:58:00 +0000 (13:58 +0100)]
Update Android to reflect upstreamed code to avoid Geolocation leaks
This is a cherry-pick of WebKit change http://trac.webkit.org/changeset/60069
This releases references to JS callbacks in the page and allows the Frame and
thus the Geolocation object to be cleaned up. This change allows us to remove
the Android-specific code which achieved the same through an unload listener.
Bug:
2169518
Change-Id: I1ed97d40d7f69ec94a58eaa21bfa4979737cc84d
Nicolas Roard [Wed, 31 Mar 2010 22:18:51 +0000 (23:18 +0100)]
Remove the use of a timer to delay painting, instead use a flag and check it
in RecordContent.
Change-Id: I2a7c11d0cb9697bbc415b2b91ee96a188bf45bf3