summaryrefslogtreecommitdiffstats
path: root/WebCore/dom/Document.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge webkit.org at r54127 : Fix final trivial mergesSteve Block2010-02-041-5/+0
| | | | Change-Id: Ib24c66a3c609fd1c8ae9697f471a8abc85e5aa33
* Merge webkit.org at r54127 : Take theirs for extra layout delay.Steve Block2010-02-041-6/+0
| | | | | | See http://trac.webkit.org/changeset/52919 and http://trac.webkit.org/changeset/53027 Change-Id: I0a5d442520651184b23ac30cf78b3c0d220c619b
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-162/+228
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Update to Android to reflect final version submitted to webkit.org when ↵Steve Block2010-02-011-3/+3
| | | | | | | | adding ChromeClient::needTouchEvents See http://trac.webkit.org/changeset/54069 Change-Id: Ie42af496d701863682c52e03613248815b7d7b4f
* Cherry pick the diff after going through review on webkit.org bug for 34215 ↵Ben Murdoch2010-01-291-0/+2
| | | | | | (implementing ChromeClient::needTouchEvents). Landed as r54069. We just needed to add an ifdef guard. Change-Id: If3fa0398e756508a718d5d3d93a5dd322a5e3f01
* Stop forwarding touch events from Java when the top level document is ↵Ben Murdoch2010-01-271-0/+11
| | | | | | | | | | | detached rather than when eventHandlers are cleared for a frame. Also no longer keep track of the number of touch event handlers that a page has registered. If a page requests touch events, always send them from Java until a new page is loaded. This simplifies the logic when dealing with the page cache as otherwise as well as restoring the forwarding of touch events when a page is restored from the page cache, we would need to restore the number of touch handlers that have been registered. Change-Id: I0269e1632a37ccbf105bac658c2cb7f1d5cd3052
* Refactor our touch event code to use the version submitted to webkit.org by ↵Ben Murdoch2010-01-201-47/+15
| | | | | | the Qt team. Change-Id: I2953472cee68aadf18f9dd740e9b3f69ad729cf0
* Check for the absence of a frame.Leon Clarke2010-01-141-1/+2
| | | | | | This crashes in the situation where the XHR responseXML method is being called on a document with meta tags. http://b/issue?id=2346028
* Updates Document::setExtraLayoutDelay to reflect recent submission to ↵Steve Block2010-01-071-5/+3
| | | | | | | | | | | | | webkit.org. setExtraLayoutDelay was an Android addition and was upstreamed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=32875 Removes Document::extraLayoutDelay by incorporating the extra delay in Document::minimumLayoutDelay. Removes ANDROID_MOBILE guards, as this extra code is not inhernetly specific to Android, and is a no-op if Document::setExtraLayoutDelay is not called. This removes the last uses of ANDROID_MOBILE. Change-Id: I1e18a994f32b29558dcf9a5c76aefab62e9fc13d
* Merge webkit.org at r51976 : Fix general conflicts.Steve Block2009-12-171-6/+4
| | | | | | | | | | | | | | | Notes ... For FrameLoader.cpp/h, see http://trac.webkit.org/changeset/51644 For FrameView.cpp and ScrolView.cpp, see http://trac.webkit.org/changeset/51636 For PluginInfoStore.cpp, see http://trac.webkit.org/changeset/51257 For Geolocation.cpp, see http://trac.webkit.org/changeset/50605 For V8DOMWrapper.cpp, see http://trac.webkit.org/changeset/51004 For V8Proxy.cpp, see http://trac.webkit.org/changeset/50441, http://trac.webkit.org/changeset/50327, http://trac.webkit.org/changeset/50406 and http://trac.webkit.org/changeset/50523 For HTMLInputElement.cpp, see http://trac.webkit.org/changeset/50996 For RenderBlock.cpp/RenderInline.cpp, see https://android-git.corp.google.com/g/#change,33465 Android-specific change to now-deleted JSCanvasArrayCustom.cpp was trivial. Change-Id: Iddc8d43bdcb6208d6a991a7a1d591e8a4f918bf7
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-171-42/+116
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Merge webkit.org at r50258 : Fix conflicts.Steve Block2009-11-101-5/+2
| | | | | | | Note that FrameLoader::gotoAnchor has been moved to FramveView::gotoAnchor. See http://trac.webkit.org/changeset/49608 Change-Id: Ic2a87bb0c0f91d371508578ddccf200967524a77
* Merge webkit.org at r50258 : Initial merge by git.Steve Block2009-11-101-50/+68
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* Makes a number of changes to ease future merging with and upstreaming to ↵Steve Block2009-10-221-0/+1
| | | | | | | | | | | | | webkit.org. - Fixes whitespace discrepancies between webkit.org and Android versions - Re-orders Android-specific changes to minimise the diff with webkit.org - Makes sure all Android-specific changes are appropriately guarded. - Fixes some Android-specific style problems None of these should introduce any functional changes for PLATFORM(ANDROID). Change-Id: Id27cf0b0e8682a7f29590c3fccae2d287b3630f1
* Merge webkit.org at R49305 : Pull WebKit change ↵Steve Block2009-10-201-1/+1
| | | | | | http://trac.webkit.org/changeset/49428 to fix build with ENABLE_INSPECTOR = 0. Change-Id: Id5cf30ed4a1753dc0659f405286fc66a76cae3c8
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-201-120/+232
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* When detach the top Document, clean up the touch listeners and resetGrace Kloba2009-09-251-0/+11
| | | | | | needTouchEvents. Fix http://b/issue?id=2145333
* Add more null checking to avoid the crash.Grace Kloba2009-09-111-4/+5
|
* Move mobile doctype check from HTMLDocument to Document so that it will ↵Grace Kloba2009-09-081-0/+9
| | | | | cover xhtml case like http://us.m1.yahoo.com. Fix http://b/issue?id=2102284
* Revert "Merge WebKit r47420"Andrei Popescu2009-08-191-28/+27
| | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
* Merge WebKit r47420Ben Murdoch2009-08-181-27/+28
|
* dom, html and loader mergesAndrei Popescu2009-08-121-3/+0
|
* Merge in WebKit r47029.Ben Murdoch2009-08-111-20/+58
|
* Get WebKit r44544.Feng Qian2009-06-171-264/+337
|
* Make WebCore built with V8.Feng Qian2009-04-241-0/+5
| | | | Picked up several new files from Chrome port.
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-101-165/+152
| | | | Automated import of CL 145796
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-293/+344
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+4493
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-4493/+0
|
* auto import from //branches/cupcake/...@126645The Android Open Source Project2009-01-151-27/+6
|
* auto import from //branches/cupcake/...@125939The Android Open Source Project2009-01-091-13/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-431/+1012
|
* Initial ContributionThe Android Open Source Project2008-10-211-92/+208
|
* external/webkit r30707Upstream1970-01-121-0/+3830