summaryrefslogtreecommitdiffstats
path: root/WebCore/page
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r75315: Move Android-specific WebCore files to SourceSteve Block2011-05-124-176/+0
| | | | | | | | | | | | | This moves files in the following WebCore subdirectories ... - bindings/js - bindings/v8/custom - plugins/android - platform/android - platform/graphics/android - page/ - css/ - dom/ - loader/archive/android
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-12196-40624/+0
| | | | Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
* Merge WebKit at r74534: Fix conflicts.Ben Murdoch2011-05-102-22/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .gitignore - keep ours Android.mk http://trac.webkit.org/changeset/74431 Parser.cpp http://trac.webkit.org/changeset/74377 ImageDecoder.cpp http://trac.webkit.org/changeset/73819 GraphicsContext.cpp http://trac.webkit.org/changeset/73729 ContextMenuItem.h http://trac.webkit.org/changeset/74028 SVGFontFaceUriElement.h http://trac.webkit.org/changeset/74493 RenderView.h http://trac.webkit.org/changeset/74524 RenderSVGResourceSolidColor.cpp http://trac.webkit.org/changeset/72926 InlineTextBox.cpp http://trac.webkit.org/changeset/73548 SliderThumbElement.cpp RenderSlider.cpp http://trac.webkit.org/changeset/74044 StyleRareInheritedData.cpp|h CSSStyleSelector.cpp CSSParser.cpp http://trac.webkit.org/changeset/73219 RenderBox.h http://trac.webkit.org/changeset/73385 FrameLoader.cpp http://trac.webkit.org/changeset/73486 http://trac.webkit.org/changeset/74426 ResourceLoader.cpp http://trac.webkit.org/changeset/74453 DOMWindow.cpp|h http://trac.webkit.org/changeset/73829 HTMLLinkElement.cpp http://trac.webkit.org/changeset/74476 V8NPUtils.cpp: Do not undo http://trac.webkit.org/changeset/78994 RenderSVGResourceSolidColor.cpp http://trac.webkit.org/changeset/72926 Remove loader.cpp http://trac.webkit.org/changeset/74049 Change-Id: I8e97de5b2237d85310e1005e067f0b3a6b14432f
* Merge WebKit at r74534: Initial merge by git.Ben Murdoch2011-05-1055-539/+2153
| | | | Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
* Fix scrolling on sites hosting content inside a single <frame>Ben Murdoch2011-03-151-9/+5
| | | | | | | | | | | | Force a layout of the frameview when we detect that a frames content post flattening is wider than the original frame. Also force a relayout of the frame as necessary to sync the correct dimensions (i.e. when navigation occurs inside the frame) Bug:4051085 Change-Id: Ib2543601a71b6931bb3ec4bfda75a2cac26bb2a1
* Clear DOM storage when clearing other cached data.Ben Murdoch2011-03-094-0/+114
| | | | | | | | | | Empty out DOM local and session storage in addition to HTML5 database and app cache when we get a request from java to delete cached data. Bug: 2117649 Change-Id: I5b6ee075d2a8fb44ee373ad4462a33623c9c2460
* Fix frameset expansion.Patrick Scott2011-02-251-10/+10
| | | | | | | | | | Do not expand frames that cannot scroll. Use contentsWidth and contentsHeight instead of exposing docWidth. Trigger a layout of the parent if the FrameView's layout reveals a larger content dimension. Remove iframe flattening code. Bug: 3370518 Bug: 3323913 Change-Id: I60e89caf335bfaf271f90ffd538c65f3735572da
* Merge "Merge WebKit at Chromium 9.0.597.106: Initial merge by Git"Steve Block2011-02-171-4/+4
|\
| * Merge WebKit at Chromium 9.0.597.106: Initial merge by GitSteve Block2011-02-161-4/+4
| | | | | | | | | | | | | | | | | | Note that we are tracking the Chromium 9.0.597 release branch, which is WebKit r72805 + stability cherry picks. This corresponds to r78455 on the 597 release branch. Change-Id: I72375d9b61a767449086f0c9dc4105b2a6b62ddc
* | apply essential security patchesCary Clark2011-02-146-11/+49
|/ | | | | | bug:3341457 bug:3341449 Change-Id: I7ba58e63a6bcf992b76eb2f5557c26ff30e63ef6
* Improve the fixed element position calculationTeng-Hui Zhu2011-02-092-0/+27
| | | | | | | | | | | | | | | | | | | | | | In the previous WAR, we get the screen size from UI thread at every draw call. That is awkward. Now with Java side fix, we can get the screen size from setSize call now. However, forcing a full re-layout seems like an expensive operation. What we need to make the webkit to know the update can be done by just updating the fixed position elements only. So I have done these: 1. Take away the WAR by forcing the update at the convertToLayerCoord. 2. Get rid of the UI thread stuff used to tell WebViewCore the screen size. And get rid of the redundant variables, too. 3. update the fixed element at the setSize time. BTW, I also rename the PlatformBridge functions name. bug: 3397602 Change-Id: I0c422ecdb570de89aecb6e568d5067acf18ecfc6
* Fix some sites not responding.Patrick Scott2011-01-182-32/+32
| | | | | | | | | | | | Enter compositing for iframes after all layout tasks have completed. Remember the state of overflow scroll similar to RenderLayer so that it doesn't change while updating the compositing state. Return false in requiresAcceleratedCompositing if the iframe is hidden. I verified that this fails on Safari and have submitted a bug. Bug: 3325187 Change-Id: I20a9e1a595d14518f4c7a3e01fc1c4fa9035262c
* Merge WebKit at Chromium 9.0.597.69: Trivial merge by Git.Ben Murdoch2011-01-162-3/+6
| | | | | | http://svn.webkit.org/repository/webkit/branches/chromium/597/WebCore@75681 Change-Id: Ibe552cf7af31f74b81e337eadf3d3b73a53daf60
* Merge "Remove ANDROID_SCROLL_ON_GOTO_ANCHOR in WebCore/config.h" into honeycombShimeng (Simon) Wang2011-01-111-7/+0
|\
| * Remove ANDROID_SCROLL_ON_GOTO_ANCHOR in WebCore/config.hShimeng (Simon) Wang2011-01-071-7/+0
| | | | | | | | | | | | | | | | | | This helps scrolling to a page#anchor link as shown in the bug. Not sure I understand the reason to have that setting at the first place. issue: 3225233 Change-Id: If2960d3c77be94b150e138a534007708f025dbad
* | Fix a warningKristian Monsen2011-01-101-3/+3
|/ | | | | | Just changing the order so they are matched in the .h and .cpp Change-Id: I88afbdded260a389da2134ccdc7946f649b8db37
* Merge WebKit at Chromium 9.0.597.55: trivial merge by gitBen Murdoch2011-01-076-2/+76
| | | | Change-Id: I2c6f2ebc4431d15ac82b5b1a9f08159e1731bc57
* Merge WebKit at r72805: Initial merge by GitSteve Block2011-01-0612-133/+47
| | | | | | | Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790
* Fix mlb shopping site not drawing correctly.Patrick Scott2011-01-041-0/+3
| | | | | | | Return false in hasOverflowScroll if flattening is on. Bug: 3309139 Change-Id: Ia4c981fab26154a38e66412d7e2938da32e7d718
* Merge WebKit at r73109: Initial merge by git.Shimeng (Simon) Wang2010-12-2239-647/+1195
| | | | Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
* Fix iframe scrolling.Patrick Scott2010-12-212-10/+28
| | | | | | | | | | | | | Do the same check everywhere for enabling scrolling in an iframe. Make sure the owner renderer is a RenderIFrame to avoid trying to composite an embedded object. Also check if the owner layer has visible content since some iframes are marked hidden. Dirty the parent normal flow list when turning on overflow scrolling for divs. Bug: 3280851 Bug: 3290276 Change-Id: I8d0a49324e06426c15abaf552874a32d6e2ee11a
* Turn off iframe compositing until it is more stable.Patrick Scott2010-12-171-1/+1
| | | | Change-Id: I2d54918b5910285bf7f1cfb408af8a6b038b65f9
* Do the same compositing check during layout.Patrick Scott2010-12-141-2/+7
| | | | | Change-Id: Ia38edb0a66f538d2020bdb9623e2fd2d7f3af97e Fix: 3280851
* Enable iframe scrolling.Patrick Scott2010-12-131-0/+7
| | | | | | | | | | Turn off iframe expansion and record iframes in a composited layer. Fix navigation by tracking iframe layers if needed. Remove the logic to add focused nodes to the last tracked layer as it is not needed and might add nodes to the wrong layer. Bug: 3219076, 3211666, 3201077, 3194321 Change-Id: Ifc0b83102438255db7e4b62ad260f50ebbdb0e50
* Merge WebKit at r72274: Initial merge by git.Russell Brenner2010-12-0231-173/+215
| | | | Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
* Merge WebKit at r71558: Initial merge by git.Teng-Hui Zhu2010-11-1736-225/+526
| | | | Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
* Merge Webkit at r70949: Fix conflicts.John Reck2010-11-092-13/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JavaScriptCore/wtf/Platform.h http://trac.webkit.org/changeset/70726 WebCore/Android.derived.v8bindings.mk http://trac.webkit.org/changeset/70854 WebCore/Android.jscbindings.mk http://trac.webkit.org/changeset/70854 WebCore/Android.mk http://trac.webkit.org/changeset/70854 WebCore/css/CSSStyleSelector.cpp http://trac.webkit.org/changeset/70250 WebCore/page/Settings.cpp http://trac.webkit.org/changeset/70714 WebCore/page/Settings.h http://trac.webkit.org/changeset/70714 WebCore/rendering/RenderBox.h http://trac.webkit.org/changeset/70482 http://trac.webkit.org/changeset/70664 http://trac.webkit.org/changeset/70917 Change-Id: I0cdaca316df016c3885a23d42ee2038777b7ccff
* Merge Webkit at r70949: Initial merge by git.John Reck2010-11-0922-37/+255
| | | | Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
* Fix some compiler warningsSteve Block2010-11-081-3/+3
| | | | | | | | | | | | | | | Noe that in FindCanvas.h we include external/icu4c/common/unicode/umachine.h, rather than external/webkit/WebCore/icu/unicode/umachine.h to avoid warnings about redefining U_NAMESPACE_BEGIN We should be using the header from external/icu4c because we don't include any ICU headers from WebCore. The fix works becuase external/icu4c/common is on the include path, but WebCore/icu is not. Change-Id: I5c0ff1c5815018ba97962595debca12a17bdd0cd
* Merge Webkit at r70209: Fix conflictsBen Murdoch2010-10-261-46/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebCore/page/FrameView.cpp http://trac.webkit.org/changeset/69896 WebCore/html/parser/HTMLDocumentParser.cpp http://trac.webkit.org/changeset/69283 WebCore/html/HTMLPlugInElement.h http://trac.webkit.org/changeset/69596 WebCore/html/HTMLInputElement.cpp http://trac.webkit.org/changeset/68996 http://trac.webkit.org/changeset/69378 WebCore/plugins/npapi.cpp http://trac.webkit.org/changeset/69808 WebCore/css/CSSComputedStyleDeclaration.cpp http://trac.webkit.org/changeset/69220 WebCore/css/CSSParser.cpp http://trac.webkit.org/changeset/69196 WebCore/rendering/style/RenderStyle.h http://trac.webkit.org/changeset/68680 WebCore/rendering/RenderImage.cpp http://trac.webkit.org/changeset/68917 WebCore/platform/android/FileSystemAndroid.cpp http://trac.webkit.org/changeset/69594 WebCore/inspector/InspectorController.h http://trac.webkit.org/changeset/68767 See also Android change I4c724f2f52a5a9db6dca6b58032b6a902aac74b5 which is why this is a conflict. JavaScriptCore/parser/Parser.cpp http://trac.webkit.org/changeset/69516 Change-Id: I5a708c6590ba029a2b3ecc3b30478ea303e1f2f5
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-2633-236/+267
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Merge Webkit at r68651 : Fix conflicts.Kristian Monsen2010-10-073-17/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ChromeClient.h: Conflict due to ANDROID_INSTALLABLE_WEB_APPS http://trac.webkit.org/changeset/68031/trunk/WebCore/page/ChromeClient.h CSSParser.cpp: Conflict due to ANDROID_INSTRUMENT http://trac.webkit.org/changeset/68521/trunk/WebCore/css/CSSParser.cpp Node.cpp: Conflict due to ANDROID_DOM_LOGGING http://trac.webkit.org/changeset/68541/trunk/WebCore/dom/Node.cpp npapi.h: Conflicts due to various #ifdef ANDROID http://trac.webkit.org/changeset/68390/trunk/WebCore/bridge/npapi.h PlatformTouchEvent.h: PlatformTouchEventAndroid.cpp: PlatformTouchPoint.h: Conflicts due to new BREWMP code next to changed Android code Initial webkit CL: http://trac.webkit.org/changeset/68499 Later fix after merge revision, so cherry-picked: http://trac.webkit.org/changeset/69034 RenderBox.cpp: Several changes, conflicts due to ANDROID_LAYOUT http://trac.webkit.org/changeset/68238#file2 http://trac.webkit.org/changeset/68239#file3 http://trac.webkit.org/changeset/68362/trunk/WebCore/rendering/RenderBox.cpp The correct resolution here is unclear. A closer investiagtion by somebdoy more familiar with the code is tracked with b/3071198 RenderBox.h: Conflicts due to ANDROID_LAYOUT http://trac.webkit.org/changeset/68417/trunk/WebCore/rendering/RenderBox.h RenderIFrame.cpp: Conflicts due to ANDROID_FLATTEN_IFRAME http://trac.webkit.org/changeset/68238/trunk/WebCore/rendering/RenderIFrame.cpp RenderTable.cpp: Conflicts due to ANDROID_LAYOUT http://trac.webkit.org/changeset/68427/trunk/WebCore/rendering/RenderTable.cpp RenderView.cpp: Conflicts due to ANDROID_LAYOUT http://trac.webkit.org/changeset/68436/trunk/WebCore/rendering/RenderView.cpp Settings.cpp: Settings.h: Conflicts due to ANDROID_PLUGINS and WEB_AUTOFILL http://trac.webkit.org/changeset/68166 Widget.cpp: http://trac.webkit.org/changeset/68054/trunk/WebCore/platform/Widget.cpp Change-Id: I156f537ae0483b89e4c6b9fce0e7b2f931f957a2
* Merge WebKit at r68651 : Initial merge by git.Kristian Monsen2010-10-0730-72/+121
| | | | Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
* Merge WebKit at r67908: Fix conflictsSteve Block2010-09-293-32/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whitespace difference in config.h - http://trac.webkit.org/changeset/67323 - WebCore/config.h Conflict due to ANDROID_LAYOUT - http://trac.webkit.org/changeset/67882 - WebCore/css/CSSComputedStyleDeclaration.cpp Conflict due to ANDROID_INSTRUMENT - http://trac.webkit.org/changeset/67704 - WebCore/css/CSSParser.cpp Conflict due to ANDROID_CSS_RING - http://trac.webkit.org/changeset/67667 - WebCore/css/CSSParser.cpp - WebCore/css/CSSStyleSelector.cpp Conflict due to axObjectCache - http://trac.webkit.org/changeset/67292 - WebCore/dom/Document.cpp Conflict due to ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS - http://trac.webkit.org/changeset/67903 - WebCore/html/HTMLInputElement.cpp Conflict due to ARCHIVE - http://trac.webkit.org/changeset/67198 - WebCore/loader/DocumentLoader.cpp - WebCore/loader/FrameLoader.cpp Conflict due to ARCHIVE - http://trac.webkit.org/changeset/67253 - WebCore/loader/FrameLoader.cpp Conflict due to actualWidth() vs width() - http://trac.webkit.org/changeset/67762 - WebCore/page/DOMWindow.cpp Conflict due to ANDROID_PLUGINS - http://trac.webkit.org/changeset/67890 - WebCore/page/Settings.cpp - WebCore/page/Settings.h Conflict due to Android MIME types - http://trac.webkit.org/changeset/67375 - WebCore/platform/MIMETypeRegistry.cpp Android fix in PluginView no longer needed after http://trac.webkit.org/changeset/67325 - WebCore/plugins/PluginView.cpp Conflict due to ANDROID_FLATTEN_IFRAME and ANDROID_FLATTEN_FRAMESET - http://trac.webkit.org/changeset/67660 - WebCore/rendering/RenderBlockLineLayout.cpp Conflict due to ANDROID_LAYOUT - http://trac.webkit.org/changeset/67660 - WebCore/rendering/RenderBox.h - WebCore/rendering/RenderTable.cpp Android fix in RenderTableCell no longer needed after http://trac.webkit.org/changeset/67862 - WebCore/rendering/RenderTableCell.cpp Conflict due to ANDROID_CSS_RING - http://trac.webkit.org/changeset/67889 and http://trac.webkit.org/changeset/67667 - WebCore/rendering/style/RenderStyle.h Change-Id: Ie36bd7de6d89a1f873c91984048f2507cabd864c fix conflicts Change-Id: I3acaba9492f6f39869e69fa24270cefbb74ba673
* Merge WebKit at r67908: Initial merge by GitSteve Block2010-09-2935-877/+374
| | | | Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
* Turn autofill on by default at compile time and make it a browser setting.Ben Murdoch2010-09-282-1/+11
| | | | | | | | | | | Make autofill a runtime option configured through the browser. Required a corresponding change in frameworks/base - https://android-git.corp.google.com/g/65573 and packages/apps/browser - https://android-git.corp.google.com/g/65579 Change-Id: I905b464a6338ff27b02f16d0b9a718154c3c98c1
* Merge "Remove superfluous Geolocation::stop() method rogue LayoutTests"Steve Block2010-09-172-8/+0
|\
| * Remove superfluous Geolocation::stop() method rogue LayoutTestsSteve Block2010-09-162-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The stop() method and LayoutTests were added in https://android-git.corp.google.com/g/#change,53849 which cherry-picked a WebKit change to attempt to stop leaks. This change has been rolled back in WebKit pending a better solution, but was retained in Android as a temporary fix. Later changes to Geolocation in WebKit have now fixed the underlying problem and this has been confirmed on Android. The temporary fix was mostly removed in the merge to WebKit r65615 in https://android-git.corp.google.com/g/#change,62318 This patch simply removes the superfluous stop() method and LayoutTests, which were missed in the above patch. Bug: 3001031 Change-Id: Id17117f285cb1a8fa600945cc6a87fc336709cab
* | Merge WebKit at r67178 : Initial merge by git.Iain Merrick2010-09-1621-685/+121
|/ | | | Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18
* Merge Webkit at r66666 : Fix conflicts.Kristian Monsen2010-09-111-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | css/CSSParser.cpp Replaced m_mediaQuery = 0 with ASSERT(!m_mediaQuery): http://trac.webkit.org/changeset/66334/trunk/WebCore/css/CSSParser.cpp dom/Document.cpp Removed a function call next to an Android specific change: http://trac.webkit.org/changeset/66247/trunk/WebCore/dom/Document.cpp html/HTMLPlugInElement.cpp Removed a function next to an Android change: http://trac.webkit.org/changeset/66653/trunk/WebCore/html/HTMLPlugInElement.cpp page/Settings.h Whitespace change in this CL: http://trac.webkit.org/changeset/66570/trunk/WebCore/page/Settings.h svg/SVGFontFaceUriElement.h Small change next to an Android change: http://trac.webkit.org/changeset/66397/trunk/WebCore/svg/SVGFontFaceUriElement.h Change-Id: I8d395474f9a08d3a1432249da9a1aa06b01765e0
* Merge WebKit at r66666 : Initial merge by git.Kristian Monsen2010-09-1126-239/+379
| | | | Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
* Allow WebKit to scroll selection on screen.Leon Scroggins2010-09-101-2/+2
| | | | | | | | | Requires a change to frameworks/base Bug 2679411 Bug 2659028 Change-Id: I482cefadc24c620c6d07cbce44acc216bdb9b8df
* Merge WebKit at r66079 : Initial merge by gitSteve Block2010-09-0225-83/+197
| | | | Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
* add web setting for enabling/disabling synthetic linksCary Clark2010-09-012-3/+7
| | | | | | | | | | | | | | According to this feature request http://b/1865484 Some webviews wish to load pages and ignore the email, phone, and postal addresses. Add a way to specify that preference to the WebView class. depends on companion change in frameworks/base Change-Id: Ibcd78ab632063d8ab403567fa40c329339e51572
* Merge WebKit at r65615 : Fix conflicts.Iain Merrick2010-08-231-17/+0
| | | | | | | | | | Removing call to Geolocation::stop(), which was lost in the merge with http://trac.webkit.org/changeset/65416 We may still have memory leaks here. This is being tracked in https://bugs.webkit.org/show_bug.cgi?id=39288 Change-Id: I69b75bf07775536ac603a450dbde8c2935c4db16
* Merge WebKit at r65615 : Initial merge by git.Iain Merrick2010-08-2332-224/+378
| | | | Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
* Merge Webkit at r65072 : Fix conflicts.Ben Murdoch2010-08-131-8/+4
| | | | | | | | | | | | HTMLInputElement.cpp: New include. See http://trac.webkit.org/changeset/64616 TemporaryLinkStubs.cpp, Navigator.h: Relocation of string forwarders. See http://trac.webkit.org/changeset/65021 GraphicsContext.h, ImageSource.h: addition of WebCore namespace on Chromium's NativeImagePtr type. See http://trac.webkit.org/changeset/64584 Platform.h: Renaming of iPhone PLATFORM macros. See http://trac.webkit.org/changeset/64798 Change-Id: Ife412e30f733fe6bb66321a3600814d6499ddf70
* Merge WebKit at r65072 : Initial merge by git.Ben Murdoch2010-08-1230-48/+68
| | | | Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
* Merge WebKit at r64523 : Fix other conflictsSteve Block2010-08-091-55/+15
| | | | | | | | | | | | | | | | | | | | | - WebCore/Android.mk Conflict due to error introduced upstream. See http://trac.webkit.org/changeset/64344/trunk/WebCore/Android.mk and http://trac.webkit.org/changeset/60228/trunk/WebCore/Android.mk - WebCore/html/HTMLFrameSetElement.cpp Conflict due to ANDROID_FLATTEN_FRAMESET See http://trac.webkit.org/changeset/64383 - WebCore/page/Navigator.h Conflict due to APPLICATION_INSTALLED See http://trac.webkit.org/changeset/64371 - WebCore/rendering/SVGResourcesCycleSolver.cpp Conflict due to local ENABLE(FILTERS) guard See http://trac.webkit.org/changeset/64440 Change-Id: Ibafe3b92117c3a7b3eaaa44c6cf3d04c8c6027c2
* Merge WebKit at r64523 : Fix conflicts due to ANDROID_HITTEST_WITHSIZESteve Block2010-08-092-30/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A modified version of this Android-specific code was upstreamed in http://trac.webkit.org/changeset/64272 For the most part, the differences between the Android and upstreamed versions are syntactic only. In these cases, we take the upstream version. In a small number of cases, logical changes exist. In these cases, the Android logic has been retained, guarded with ANDROID_HITTEST_WITHSIZE, but using the new syntax. In particular ... - Android's HitTestResult::intersects(x, y, rect) is logically equivalent to the uspstream IntRect::intersects(HitTestPoint::rectFromPoint(x, y))). - Android's HitTestResult::addRawNode() is logically equivalent to the upstream HitTestResult::m_rectBasedTestResult.add(). - Android's HitTestResult::isRegionTest() is slightly different from the upstream HitTestResult::isRectBasedTest(). The latter is modified with a new ANDROID_HITTEST_WITHSIZE guard in HitTestResult::HitTestResult() to maintain the same behaviour. - The upstreamed code uses HitTestResult::addNodeToRectBasedTestResult() as a helper method in place of inline logic in the Android version. The slight difference in behaviour between this helper and the Android logic is reflected in the new ANDROID_HITTEST_WITHSIZE guard in the helper. This change should introduce no change in behaviour. Change-Id: I974d68e3ac963f18334418e32b08c3fd9ab1182e
generated by cgit v1.1 at 2024-10-02 11:53:54 +0000