Title: [128009] trunk/Source/WebCore
Revision
128009
Author
[email protected]
Date
2012-09-09 18:09:40 -0700 (Sun, 09 Sep 2012)

Log Message

Try to fix the build after r128006.

* dom/Element.cpp:
(WebCore::Element::boundsInRootViewSpace): Updated for rename.
(WebCore::Element::getBoundingClientRect): Ditto.
* svg/SVGElement.cpp:
(WebCore::SVGElement::getBoundingBox): Renamed boundingBox() to this, to avoid clashing
with the virtual function on Node. The 'get' prefix also indicates that the result is
returned in an out parameter.
* svg/SVGElement.h:
(SVGElement):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (128008 => 128009)


--- trunk/Source/WebCore/ChangeLog	2012-09-10 00:45:58 UTC (rev 128008)
+++ trunk/Source/WebCore/ChangeLog	2012-09-10 01:09:40 UTC (rev 128009)
@@ -1,3 +1,17 @@
+2012-09-09  Dan Bernstein  <[email protected]>
+
+        Try to fix the build after r128006.
+
+        * dom/Element.cpp:
+        (WebCore::Element::boundsInRootViewSpace): Updated for rename.
+        (WebCore::Element::getBoundingClientRect): Ditto.
+        * svg/SVGElement.cpp:
+        (WebCore::SVGElement::getBoundingBox): Renamed boundingBox() to this, to avoid clashing
+        with the virtual function on Node. The 'get' prefix also indicates that the result is
+        returned in an out parameter.
+        * svg/SVGElement.h:
+        (SVGElement):
+
 2012-09-09  Patrick Gansterer  <[email protected]>
 
         Replace WTF::numberToString() with String::numberToStringECMAScript()

Modified: trunk/Source/WebCore/dom/Element.cpp (128008 => 128009)


--- trunk/Source/WebCore/dom/Element.cpp	2012-09-10 00:45:58 UTC (rev 128008)
+++ trunk/Source/WebCore/dom/Element.cpp	2012-09-10 01:09:40 UTC (rev 128009)
@@ -532,7 +532,7 @@
         // Get the bounding rectangle from the SVG model.
         SVGElement* svgElement = static_cast<SVGElement*>(this);
         FloatRect localRect;
-        if (svgElement->boundingBox(localRect))
+        if (svgElement->getBoundingBox(localRect))
             quads.append(renderer()->localToAbsoluteQuad(localRect));
     } else
 #endif
@@ -580,7 +580,7 @@
         // Get the bounding rectangle from the SVG model.
         SVGElement* svgElement = static_cast<SVGElement*>(this);
         FloatRect localRect;
-        if (svgElement->boundingBox(localRect))
+        if (svgElement->getBoundingBox(localRect))
             quads.append(renderer()->localToAbsoluteQuad(localRect));
     } else
 #endif

Modified: trunk/Source/WebCore/svg/SVGElement.cpp (128008 => 128009)


--- trunk/Source/WebCore/svg/SVGElement.cpp	2012-09-10 00:45:58 UTC (rev 128008)
+++ trunk/Source/WebCore/svg/SVGElement.cpp	2012-09-10 01:09:40 UTC (rev 128009)
@@ -248,7 +248,7 @@
     return svgRareData()->elementInstances();
 }
 
-bool SVGElement::boundingBox(FloatRect& rect, SVGLocatable::StyleUpdateStrategy styleUpdateStrategy)
+bool SVGElement::getBoundingBox(FloatRect& rect, SVGLocatable::StyleUpdateStrategy styleUpdateStrategy)
 {
     if (isStyledLocatable()) {
         rect = static_cast<SVGStyledLocatableElement*>(this)->getBBox(styleUpdateStrategy);

Modified: trunk/Source/WebCore/svg/SVGElement.h (128008 => 128009)


--- trunk/Source/WebCore/svg/SVGElement.h	2012-09-10 00:45:58 UTC (rev 128008)
+++ trunk/Source/WebCore/svg/SVGElement.h	2012-09-10 01:09:40 UTC (rev 128009)
@@ -83,7 +83,7 @@
 
     const HashSet<SVGElementInstance*>& instancesForElement() const;
 
-    bool boundingBox(FloatRect&, SVGLocatable::StyleUpdateStrategy = SVGLocatable::AllowStyleUpdate);
+    bool getBoundingBox(FloatRect&, SVGLocatable::StyleUpdateStrategy = SVGLocatable::AllowStyleUpdate);
 
     void setCursorElement(SVGCursorElement*);
     void cursorElementRemoved();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to