Skip to site navigation (Press enter)

[webkit-changes] [115759] branches/subpixellayout/Source

eae Tue, 01 May 2012 16:18:01 -0700

Title: [115759] branches/subpixellayout/Source

Revision: 115759
Author: e...@chromium.org
Date: 2012-05-01 16:18:53 -0700 (Tue, 01 May 2012)

Log Message

Chromium/linux fixes for branch.

Modified Paths

branches/subpixellayout/Source/WebCore/WebCore.exp.in
branches/subpixellayout/Source/WebCore/WebCore.order
branches/subpixellayout/Source/WebKit/chromium/public/WebHitTestResult.h
branches/subpixellayout/Source/WebKit/chromium/src/WebHitTestResult.cpp
branches/subpixellayout/Source/WebKit/chromium/src/WebSurroundingText.cpp

Diff

Modified: branches/subpixellayout/Source/WebCore/WebCore.exp.in (115758 => 115759)


--- branches/subpixellayout/Source/WebCore/WebCore.exp.in	2012-05-01 23:09:14 UTC (rev 115758)
+++ branches/subpixellayout/Source/WebCore/WebCore.exp.in	2012-05-01 23:18:53 UTC (rev 115759)
@@ -238,7 +238,6 @@
 __ZN7WebCore12EventHandler15handleAccessKeyERKNS_21PlatformKeyboardEventE
 __ZN7WebCore12EventHandler16handleWheelEventERKNS_18PlatformWheelEventE
 __ZN7WebCore12EventHandler17scrollRecursivelyENS_15ScrollDirectionENS_17ScrollGranularityEPNS_4NodeE
-__ZN7WebCore12EventHandler20hitTestResultAtPointERKNS_21FractionalLayoutPointEbbNS_17HitTestScrollbarsEjRKNS_20FractionalLayoutSizeE
 __ZN7WebCore12EventHandler21handleMousePressEventERKNS_18PlatformMouseEventE
 __ZN7WebCore12EventHandler23handleMouseReleaseEventERKNS_18PlatformMouseEventE
 __ZN7WebCore12EventHandler24logicalScrollRecursivelyENS_22ScrollLogicalDirectionENS_17ScrollGranularityEPNS_4NodeE
@@ -268,7 +267,6 @@
 __ZN7WebCore12PrintContext9spoolRectERNS_15GraphicsContextERKNS_7IntRectE
 __ZN7WebCore12PrintContextC1EPNS_5FrameE
 __ZN7WebCore12PrintContextD1Ev
-__ZN7WebCore12RenderObject16repaintRectangleERKNS_20FractionalLayoutRectEb
 __ZN7WebCore12RenderObject19scrollRectToVisibleERKNS_20FractionalLayoutRectERKNS_15ScrollAlignmentES6_
 __ZN7WebCore12RenderWidget28resumeWidgetHierarchyUpdatesEv
 __ZN7WebCore12RenderWidget29suspendWidgetHierarchyUpdatesEv

Modified: branches/subpixellayout/Source/WebCore/WebCore.order (115758 => 115759)


--- branches/subpixellayout/Source/WebCore/WebCore.order	2012-05-01 23:09:14 UTC (rev 115758)
+++ branches/subpixellayout/Source/WebCore/WebCore.order	2012-05-01 23:18:53 UTC (rev 115759)
@@ -3508,7 +3508,6 @@
 __ZN7WebCore13RootInlineBox29removeLineBoxFromRenderObjectEv
 __ZN7WebCore17RenderLineBoxList13removeLineBoxEPNS_13InlineFlowBoxE
 __ZNK7WebCore11RenderBlock20adjustRectForColumnsERNS_7IntRectE
-__ZN7WebCore12RenderObject16repaintRectangleERKNS_7IntRectEb
 __ZNK7WebCore22HTMLFormControlElement11isFocusableEv
 __ZNK7WebCore22HTMLFormControlElement13supportsFocusEv
 __ZN7WebCore15FocusController14setFocusedNodeEPNS_4NodeEN3WTF10PassRefPtrINS_5FrameEEE
@@ -6248,13 +6247,11 @@
 __ZN7WebCore25AccessibilityRenderObjectD2Ev
 __ZN7WebCore14RenderMenuList11removeChildEPNS_12RenderObjectE
 __ZN7WebCore14RenderMenuListD0Ev
-__ZN7WebCore13HitTestResultC1ERKNS_8IntPointE
 __ZN7WebCore11RenderLayer7hitTestERKNS_14HitTestRequestERNS_13HitTestResultE
 __ZN7WebCore11RenderLayer12hitTestLayerEPS0_S1_RKNS_14HitTestRequestERNS_13HitTestResultERKNS_7IntRectERKNS_8IntPointEbPKNS_24HitTestingTransformStateEPd
 __ZN7WebCore13HitTestResult12rectForPointERKNS_8IntPointEjjjj
 __ZN7WebCore11RenderLayer35update3DTransformedDescendantStatusEv
 __ZN7WebCore11RenderLayer11hitTestListEPN3WTF6VectorIPS0_Lm0EEES3_RKNS_14HitTestRequestERNS_13HitTestResultERKNS_7IntRectERKNS_8IntPointEPKNS_24HitTestingTransformStateEPdSK_SJ_b
-__ZN7WebCore13HitTestResultC1ERKNS_8IntPointEjjjj
 __ZNK7WebCore11RenderLayer15hitTestContentsERKNS_14HitTestRequestERNS_13HitTestResultERKNS_7IntRectERKNS_8IntPointENS_13HitTestFilterE
 __ZN7WebCore12RenderObject7hitTestERKNS_14HitTestRequestERNS_13HitTestResultERKNS_8IntPointEiiNS_13HitTestFilterE
 __ZN7WebCore11RenderBlock11nodeAtPointERKNS_14HitTestRequestERNS_13HitTestResultERKNS_8IntPointEiiNS_13HitTestActionE
@@ -14360,7 +14357,6 @@
 __ZN3WTF9HashTableIPKvSt4pairIS2_N7WebCore7IntSizeEENS_18PairFirstExtractorIS6_EENS_7PtrHashIS2_EENS_14PairHashTraitsINS_10HashTraitsIS2_EENSC_IS5_EEEESD_E4findIS2_NS_22IdentityHashTranslatorIS2_S6_SA_EEEENS_17HashTableIteratorIS2_S6_S8_SA_SF_SD_EERKT_
 __ZN3WTF9HashTableIPKvSt4pairIS2_N7WebCore7IntSizeEENS_18PairFirstExtractorIS6_EENS_7PtrHashIS2_EENS_14PairHashTraitsINS_10HashTraitsIS2_EENSC_IS5_EEEESD_E6rehashEi
 __ZN3WTF9HashTableIPKvSt4pairIS2_N7WebCore7IntSizeEENS_18PairFirstExtractorIS6_EENS_7PtrHashIS2_EENS_14PairHashTraitsINS_10HashTraitsIS2_EENSC_IS5_EEEESD_EaSERKSG_
-__ZN7WebCore12EventHandler20hitTestResultAtPointERKNS_8IntPointEbbNS_17HitTestScrollbarsEjRKNS_7IntSizeE
 __ZNK7WebCore13HitTestResult10isSelectedEv
 __ZN3WTF9HashTableIN7WebCore7IntSizeESt4pairIS2_jENS_18PairFirstExtractorIS4_EENS_7IntHashIS2_EENS_14PairHashTraitsINS_10HashTraitsIS2_EENSA_IjEEEESB_E16lookupForWritingIS2_NS_22IdentityHashTranslatorIS2_S4_S8_EEEES3_IPS4_bERKT_
 __ZN3WTF9HashTableIN7WebCore7IntSizeESt4pairIS2_jENS_18PairFirstExtractorIS4_EENS_7IntHashIS2_EENS_14PairHashTraitsINS_10HashTraitsIS2_EENSA_IjEEEESB_E3addIS2_jNS_17HashMapTranslatorIS4_SD_S8_EEEES3_INS_17HashTableIteratorIS2_S4_S6_S8_SD_SB_EEbERKT_RKT0_

Modified: branches/subpixellayout/Source/WebKit/chromium/public/WebHitTestResult.h (115758 => 115759)


--- branches/subpixellayout/Source/WebKit/chromium/public/WebHitTestResult.h	2012-05-01 23:09:14 UTC (rev 115758)
+++ branches/subpixellayout/Source/WebKit/chromium/public/WebHitTestResult.h	2012-05-01 23:18:53 UTC (rev 115759)
@@ -56,8 +56,6 @@
     // Coordinates of the point that was hit. Relative to the node.
     WEBKIT_EXPORT WebPoint localPoint() const;
 
-    WEBKIT_EXPORT VisiblePosition visiblePosition() const;
-
 #if WEBKIT_IMPLEMENTATION
     WebHitTestResult(const WebCore::HitTestResult&);
     WebHitTestResult& operator=(const WebCore::HitTestResult&);

Modified: branches/subpixellayout/Source/WebKit/chromium/src/WebHitTestResult.cpp (115758 => 115759)


--- branches/subpixellayout/Source/WebKit/chromium/src/WebHitTestResult.cpp	2012-05-01 23:09:14 UTC (rev 115758)
+++ branches/subpixellayout/Source/WebKit/chromium/src/WebHitTestResult.cpp	2012-05-01 23:18:53 UTC (rev 115759)
@@ -50,15 +50,6 @@
     return WebPoint(roundedIntPoint(m_private->localPoint()));
 }
 
-VisiblePosition WebHitTestResult::visiblePosition() const
-{
-    Node* node = node().unwrap<Node>();
-    if (!node || !node->renderer())
-        return;
-
-    return node->renderer()->positionForPoint(m_private->localPoint()));
-}
-
 WebHitTestResult::WebHitTestResult(const HitTestResult& result)
 {
     m_private.reset(new HitTestResult(result));

Modified: branches/subpixellayout/Source/WebKit/chromium/src/WebSurroundingText.cpp (115758 => 115759)


--- branches/subpixellayout/Source/WebKit/chromium/src/WebSurroundingText.cpp	2012-05-01 23:09:14 UTC (rev 115758)
+++ branches/subpixellayout/Source/WebKit/chromium/src/WebSurroundingText.cpp	2012-05-01 23:18:53 UTC (rev 115759)
@@ -42,10 +42,14 @@
 
 void WebSurroundingText::initialize(const WebHitTestResult& hitTestInfo, size_t maxLength)
 {
-    VisiblePosition visiblePosition = hitTestInfo.visiblePosition();
-    if (!visiblePosition || visiblePosition.isNull())
+    Node* node = hitTestInfo.node().unwrap<Node>();
+    if (!node || !node->renderer())
         return;
 
+    VisiblePosition visiblePosition(node->renderer()->positionForPoint(static_cast<IntPoint>(hitTestInfo.localPoint())));
+    if (visiblePosition.isNull())
+        return;
+
     m_private.reset(new SurroundingText(visiblePosition, maxLength));
 }

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes