summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Work around build problem caused by too many stubs in a stub group.Doug Kwan2010-06-041-2/+4
| | | | Change-Id: I7ec73e2379db205330deb3e612700e5295e0b4d4
* Merge "Fix platformVisibleContentRect() for the sub frame. The visibleBounds ↵Grace Kloba2010-06-041-5/+15
|\ | | | | | | is only set to the top frame. For sub frame, we need to intersect it with the sub frame's own bounds."
| * Fix platformVisibleContentRect() for the sub frame.Grace Kloba2010-06-031-5/+15
| | | | | | | | | | | | | | | | 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
* | Fall back to old linker temporarily due to a bug in gold.Doug Kwan2010-06-041-0/+3
|/ | | | Change-Id: Ibf6eb848238f37d52be7bd24760ee21dc9411e62
* Add indexeddb layout tests at 60074 in preparation for the new merge.Leon Clarke2010-06-034-0/+119
| | | | | | They won't work, but will be added to the skip list. Change-Id: Iee37cfb4abcf7dd02ec83d482e87fdc057d5e308
* Enable File Reader and blob.slice APIs.Ben Murdoch2010-06-0212-18/+40
| | | | | | | | | 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
* Code clean up, http://b/issue?id=2724743Grace Kloba2010-05-2816-95/+53
| | | | | | | | | | | | | | | | | | | | | | | | 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
* Use the real visibleBounds for the ScrollView'sGrace Kloba2010-05-283-2/+11
| | | | | | | | | 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
* Report correct window.innerWidth and window.innerHeight.Grace Kloba2010-05-276-16/+121
| | | | | | | | | | | 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.
* Merge "Fix popup window default size."Grace Kloba2010-05-271-1/+9
|\
| * Fix popup window default size.Grace Kloba2010-05-271-1/+9
| | | | | | | | The change has been submitted to WebKit. https://bugs.webkit.org/show_bug.cgi?id=39835
* | Added getTouchHighlightRects for the fat point.Grace Kloba2010-05-272-0/+300
| | | | | | | | There is another matching CL in framework/base.
* | Merge WebKit at r60074: Update WEBKIT_MERGE_REVISIONSteve Block2010-05-271-2/+2
| | | | | | | | Change-Id: I0d3f2bcfe262888ca1388b56c680d13e3b1f455c
* | Merge WebKit at r60074: Update Android-specific expected LayoutTests resultsSteve Block2010-05-272-1/+3
| | | | | | | | | | | | | | | | | | | | 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
* | Merge WebKit at r60074: Remove ANDROID_EXPOSE_COLUMN_GAP as ↵Steve Block2010-05-272-4/+0
| | | | | | | | | | | | | | | | RenderBlock::columnGap() is now public See http://trac.webkit.org/changeset/59784 Change-Id: I06ab20401e79c8b9c8104bb6a81c5891ef36d717
* | Merge WebKit at r60074: RenderStyle color accessors are now privateSteve Block2010-05-273-7/+7
| | | | | | | | | | | | See http://trac.webkit.org/changeset/59956 Change-Id: If1839f65ad960250c7dda5b565bd47278aa7df14
* | Merge WebKit at r60074: Pass null DeviceOrientationClient to Page constructorSteve Block2010-05-272-2/+4
| | | | | | | | Change-Id: I0afccb0d08d42f13579ff7df4c41ed2d07abb36e
* | Merge WebKit at r60074: Fix Android makefilesSteve Block2010-05-273-0/+5
| | | | | | | | Change-Id: I549373cf00e9cc72060eccaf55e6a3efb0623df0
* | Merge WebKit at r60074: Fix conflictsSteve Block2010-05-2712-145/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-271055-8109/+110820
|/ | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* Merge "Remove the unnecessary return keyword."Shimeng (Simon) Wang2010-05-263-6/+6
|\
| * Remove the unnecessary return keyword.Shimeng (Simon) Wang2010-05-263-6/+6
| | | | | | | | Change-Id: If55ba03f4c46afed544083263fbd6d3577807909
* | Merge "Refix http://b/issue?id=2509597."Grace Kloba2010-05-262-20/+13
|\ \ | |/ |/|
| * Refix http://b/issue?id=2509597.Grace Kloba2010-05-262-20/+13
| | | | | | | | | | | | | | | | | | | | 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
* | Choose right operator new/delete in case of multiple inheritance.Shimeng (Simon) Wang2010-05-261-0/+16
|/ | | | Change-Id: I5ae0c7ad9e06021a8149b5b70fdb20a0f0a8f4d8
* Merge WebKit at r59636: Update WebKit versionKristian Monsen2010-05-251-2/+2
| | | | Change-Id: I784830d55a5238da319e9487fd113d81b11b4735
* Merge "Merge WebKit at r59636: Variable changed to method upstream ↵Kristian Monsen2010-05-251-1/+1
|\ | | | | | | http://trac.webkit.org/changeset/59576/trunk/WebCore/loader/CachedResource.h#file0"
| * Merge WebKit at r59636: Variable changed to method upstreamKristian Monsen2010-05-251-1/+1
| | | | | | | | | | | | http://trac.webkit.org/changeset/59576/trunk/WebCore/loader/CachedResource.h#file0 Change-Id: Icf2abd0e5983cd4c2188305889edec4e072e684e
* | Merge "Merge WebKit at r59636: Added header needed for Android"Kristian Monsen2010-05-251-0/+2
|\ \ | |/
| * Merge WebKit at r59636: Added header needed for AndroidKristian Monsen2010-05-251-0/+2
| | | | | | | | Change-Id: I15e893f845e1d4b0c15548350511e45eee35dbb1
* | Merge "Merge WebKit at r59636: Method name changed upstream ↵Kristian Monsen2010-05-251-1/+1
|\ \ | |/ | | | | http://trac.webkit.org/changeset/59227/trunk/WebCore/html/HTMLLabelElement.h#file0"
| * Merge WebKit at r59636: Method name changed upstreamKristian Monsen2010-05-251-1/+1
| | | | | | | | | | | | http://trac.webkit.org/changeset/59227/trunk/WebCore/html/HTMLLabelElement.h#file0 Change-Id: I78e259fde5c59c9fe84173abedc8ff3996142381
* | Merge changes I03b28d93,Ie53e458fKristian Monsen2010-05-257-22/+45
|\ \ | |/ | | | | | | | | * 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
| * Merge WebKit at r59636: Fix Android ifdef, commas moved upstream.Kristian Monsen2010-05-251-2/+2
| | | | | | | | | | | | http://trac.webkit.org/changeset/59035/trunk/WebCore/bridge/npapi.h#file0 Change-Id: I03b28d93e229f5a0f7dbc918c0234a549bb73071
| * Merge WebKit at r59636: Fix makefilesKristian Monsen2010-05-256-20/+43
| | | | | | | | Change-Id: Ie53e458fbec03234aeb3ba16ce4d90aa629d3575
* | Merge "Merge WebKit at r59636: Fix conflicts"Kristian Monsen2010-05-254-128/+26
|\ \ | |/
| * Merge WebKit at r59636: Fix conflictsKristian Monsen2010-05-254-128/+26
| | | | | | | | Change-Id: If40295eb42282bace49d422e4a24026ddac17cfe
* | Merge "Merge WebKit at r59636: Initial merge by git"Kristian Monsen2010-05-251048-37318/+70667
|\ \ | |/
| * Merge WebKit at r59636: Initial merge by gitKristian Monsen2010-05-251048-37318/+70667
| | | | | | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
* | Do not try to show pdf's in the browser.Patrick Scott2010-05-251-19/+25
|/ | | | | | | | | | 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
* Merge "First draft to add a fat point to WebKit hit test."Grace Kloba2010-05-2417-0/+331
|\
| * First draft to add a fat point to WebKit hit test.Grace Kloba2010-05-2417-0/+331
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Only set extra_layout_delay if the loader is notGrace Kloba2010-05-241-1/+3
| | | | | | | | | | | | | | | | | | | | 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
* | Merge "Fix a binding big in WebKit which prevents url hijacking for mobile ↵Grace Kloba2010-05-242-2/+2
|\ \ | | | | | | | | | adsense."
| * | Fix a binding big in WebKit which prevents urlGrace Kloba2010-05-242-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | implement Canvas.toDataURLCary Clark2010-05-241-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "check for null on extremely large images"Cary Clark2010-05-241-1/+1
|\ \ \
| * | | check for null on extremely large imagesCary Clark2010-05-241-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Cherry-pick WebKit change 59918 to fix Java bridge for JSC"Steve Block2010-05-241-1/+3
|\ \ \
| * | | Cherry-pick WebKit change 59918 to fix Java bridge for JSCSteve Block2010-05-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is required to allow the LayoutTestController to work. See http://trac.webkit.org/changeset/59918 Change-Id: I96ab4a0da1ebb9e42cff43e4296341830d57f078