Get rid of SVGRect special case from the bindings generator

Get rid of SVGRect special case from the bindings generator

Get rid of SVGRect special case from the bindings generator by adding a
a typedef to FloatRect in SVGRect.h.

Also use SVGRect type in the implementation API for consistency with
the IDL.

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=154204

[Stephen Chennney, 2013-07-12 15:26:55]

lgtm

[commit-bot: I haz the power, 2013-07-12 15:27:10]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ch.dumez@sisa.samsung.com/19096011/1

[commit-bot: I haz the power, 2013-07-12 15:27:18]

Failed to apply patch for Source/core/svg/SVGSVGElement.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/svg/SVGSVGElement.cpp
  Hunk #5 FAILED at 544.
  1 out of 5 hunks FAILED -- saving rejects to file
Source/core/svg/SVGSVGElement.cpp.rej

Patch:       Source/core/svg/SVGSVGElement.cpp
Index: Source/core/svg/SVGSVGElement.cpp
diff --git a/Source/core/svg/SVGSVGElement.cpp
b/Source/core/svg/SVGSVGElement.cpp
index
1fb7667fb2854940716f1f4606da9ae285085a0d..05466dfb5a28a4d0c8c10fd1be6ce5a5132df0f6
100644
--- a/Source/core/svg/SVGSVGElement.cpp
+++ b/Source/core/svg/SVGSVGElement.cpp
@@ -131,11 +131,11 @@ void SVGSVGElement::setContentStyleType(const
AtomicString& type)
     setAttribute(SVGNames::contentStyleTypeAttr, type);
 }
 
-FloatRect SVGSVGElement::viewport() const
+SVGRect SVGSVGElement::viewport() const
 {
     // FIXME: This method doesn't follow the spec and is basically untested.
Parent documents are not considered here.
     // As we have no test coverage for this, we're going to disable it
completly for now.
-    return FloatRect();
+    return SVGRect();
 }
 
 float SVGSVGElement::pixelUnitToMillimeterX() const
@@ -327,7 +327,7 @@ void SVGSVGElement::forceRedraw()
     // FIXME: Implement me (see bug 11275)
 }
 
-PassRefPtr<NodeList> SVGSVGElement::collectIntersectionOrEnclosureList(const
FloatRect& rect, SVGElement* referenceElement, CollectIntersectionOrEnclosure
collect) const
+PassRefPtr<NodeList> SVGSVGElement::collectIntersectionOrEnclosureList(const
SVGRect& rect, SVGElement* referenceElement, CollectIntersectionOrEnclosure
collect) const
 {
     Vector<RefPtr<Node> > nodes;
     Element* element = ElementTraversal::next(referenceElement ?
referenceElement : this);
@@ -348,24 +348,24 @@ PassRefPtr<NodeList>
SVGSVGElement::collectIntersectionOrEnclosureList(const Flo
     return StaticNodeList::adopt(nodes);
 }
 
-PassRefPtr<NodeList> SVGSVGElement::getIntersectionList(const FloatRect& rect,
SVGElement* referenceElement) const
+PassRefPtr<NodeList> SVGSVGElement::getIntersectionList(const SVGRect& rect,
SVGElement* referenceElement) const
 {
     return collectIntersectionOrEnclosureList(rect, referenceElement,
CollectIntersectionList);
 }
 
-PassRefPtr<NodeList> SVGSVGElement::getEnclosureList(const FloatRect& rect,
SVGElement* referenceElement) const
+PassRefPtr<NodeList> SVGSVGElement::getEnclosureList(const SVGRect& rect,
SVGElement* referenceElement) const
 {
     return collectIntersectionOrEnclosureList(rect, referenceElement,
CollectEnclosureList);
 }
 
-bool SVGSVGElement::checkIntersection(SVGElement* element, const FloatRect&
rect) const
+bool SVGSVGElement::checkIntersection(SVGElement* element, const SVGRect& rect)
const
 {
     if (!element)
         return false;
     return RenderSVGModelObject::checkIntersection(element->renderer(), rect);
 }
 
-bool SVGSVGElement::checkEnclosure(SVGElement* element, const FloatRect& rect)
const
+bool SVGSVGElement::checkEnclosure(SVGElement* element, const SVGRect& rect)
const
 {
     if (!element)
         return false;
@@ -403,9 +403,9 @@ SVGMatrix SVGSVGElement::createSVGMatrix()
     return SVGMatrix();
 }
 
-FloatRect SVGSVGElement::createSVGRect()
+SVGRect SVGSVGElement::createSVGRect()
 {
-    return FloatRect();
+    return SVGRect();
 }
 
 SVGTransform SVGSVGElement::createSVGTransform()
@@ -544,27 +544,27 @@ bool SVGSVGElement::selfHasRelativeLengths() const
         || hasAttribute(SVGNames::viewBoxAttr);
 }
 
-FloatRect SVGSVGElement::currentViewBoxRect() const
+SVGRect SVGSVGElement::currentViewBoxRect() const
 {
     if (m_useCurrentView)
-        return m_viewSpec ? m_viewSpec->viewBox() : FloatRect();
+        return m_viewSpec ? m_viewSpec->viewBox() : SVGRect();
 
-    FloatRect useViewBox = viewBox();
+    SVGRect useViewBox = viewBox();
     if (!useViewBox.isEmpty())
         return useViewBox;
     if (!renderer() || !renderer()->isSVGRoot())
-        return FloatRect();
+        return SVGRect();
     if (!toRenderSVGRoot(renderer())->isEmbeddedThroughSVGImage())
-        return FloatRect();
+        return SVGRect();
 
     Length intrinsicWidth = this->intrinsicWidth();
     Length intrinsicHeight = this->intrinsicHeight();
     if (!intrinsicWidth.isFixed() || !intrinsicHeight.isFixed())
-        return FloatRect();
+        return SVGRect();
 
     // If no viewBox is specified but non-relative width/height values, then we
     // should always synthesize a viewBox if we're embedded through a SVGImage.
   
-    return FloatRect(FloatPoint(),
FloatSize(floatValueForLength(intrinsicWidth, 0),
floatValueForLength(intrinsicHeight, 0)));
+    return SVGRect(FloatPoint(), FloatSize(floatValueForLength(intrinsicWidth,
0), floatValueForLength(intrinsicHeight, 0)));
 }
 
 FloatSize SVGSVGElement::currentViewportSize() const

[haraken, 2013-07-12 15:35:58]

LGTM

[commit-bot: I haz the power, 2013-07-12 20:58:09]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ch.dumez@sisa.samsung.com/19096011/1

[commit-bot: I haz the power, 2013-07-12 20:58:18]

Failed to apply patch for Source/core/svg/SVGSVGElement.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/svg/SVGSVGElement.cpp
  Hunk #5 FAILED at 544.
  1 out of 5 hunks FAILED -- saving rejects to file
Source/core/svg/SVGSVGElement.cpp.rej

Patch:       Source/core/svg/SVGSVGElement.cpp
Index: Source/core/svg/SVGSVGElement.cpp
diff --git a/Source/core/svg/SVGSVGElement.cpp
b/Source/core/svg/SVGSVGElement.cpp
index
1fb7667fb2854940716f1f4606da9ae285085a0d..05466dfb5a28a4d0c8c10fd1be6ce5a5132df0f6
100644
--- a/Source/core/svg/SVGSVGElement.cpp
+++ b/Source/core/svg/SVGSVGElement.cpp
@@ -131,11 +131,11 @@ void SVGSVGElement::setContentStyleType(const
AtomicString& type)
     setAttribute(SVGNames::contentStyleTypeAttr, type);
 }
 
-FloatRect SVGSVGElement::viewport() const
+SVGRect SVGSVGElement::viewport() const
 {
     // FIXME: This method doesn't follow the spec and is basically untested.
Parent documents are not considered here.
     // As we have no test coverage for this, we're going to disable it
completly for now.
-    return FloatRect();
+    return SVGRect();
 }
 
 float SVGSVGElement::pixelUnitToMillimeterX() const
@@ -327,7 +327,7 @@ void SVGSVGElement::forceRedraw()
     // FIXME: Implement me (see bug 11275)
 }
 
-PassRefPtr<NodeList> SVGSVGElement::collectIntersectionOrEnclosureList(const
FloatRect& rect, SVGElement* referenceElement, CollectIntersectionOrEnclosure
collect) const
+PassRefPtr<NodeList> SVGSVGElement::collectIntersectionOrEnclosureList(const
SVGRect& rect, SVGElement* referenceElement, CollectIntersectionOrEnclosure
collect) const
 {
     Vector<RefPtr<Node> > nodes;
     Element* element = ElementTraversal::next(referenceElement ?
referenceElement : this);
@@ -348,24 +348,24 @@ PassRefPtr<NodeList>
SVGSVGElement::collectIntersectionOrEnclosureList(const Flo
     return StaticNodeList::adopt(nodes);
 }
 
-PassRefPtr<NodeList> SVGSVGElement::getIntersectionList(const FloatRect& rect,
SVGElement* referenceElement) const
+PassRefPtr<NodeList> SVGSVGElement::getIntersectionList(const SVGRect& rect,
SVGElement* referenceElement) const
 {
     return collectIntersectionOrEnclosureList(rect, referenceElement,
CollectIntersectionList);
 }
 
-PassRefPtr<NodeList> SVGSVGElement::getEnclosureList(const FloatRect& rect,
SVGElement* referenceElement) const
+PassRefPtr<NodeList> SVGSVGElement::getEnclosureList(const SVGRect& rect,
SVGElement* referenceElement) const
 {
     return collectIntersectionOrEnclosureList(rect, referenceElement,
CollectEnclosureList);
 }
 
-bool SVGSVGElement::checkIntersection(SVGElement* element, const FloatRect&
rect) const
+bool SVGSVGElement::checkIntersection(SVGElement* element, const SVGRect& rect)
const
 {
     if (!element)
         return false;
     return RenderSVGModelObject::checkIntersection(element->renderer(), rect);
 }
 
-bool SVGSVGElement::checkEnclosure(SVGElement* element, const FloatRect& rect)
const
+bool SVGSVGElement::checkEnclosure(SVGElement* element, const SVGRect& rect)
const
 {
     if (!element)
         return false;
@@ -403,9 +403,9 @@ SVGMatrix SVGSVGElement::createSVGMatrix()
     return SVGMatrix();
 }
 
-FloatRect SVGSVGElement::createSVGRect()
+SVGRect SVGSVGElement::createSVGRect()
 {
-    return FloatRect();
+    return SVGRect();
 }
 
 SVGTransform SVGSVGElement::createSVGTransform()
@@ -544,27 +544,27 @@ bool SVGSVGElement::selfHasRelativeLengths() const
         || hasAttribute(SVGNames::viewBoxAttr);
 }
 
-FloatRect SVGSVGElement::currentViewBoxRect() const
+SVGRect SVGSVGElement::currentViewBoxRect() const
 {
     if (m_useCurrentView)
-        return m_viewSpec ? m_viewSpec->viewBox() : FloatRect();
+        return m_viewSpec ? m_viewSpec->viewBox() : SVGRect();
 
-    FloatRect useViewBox = viewBox();
+    SVGRect useViewBox = viewBox();
     if (!useViewBox.isEmpty())
         return useViewBox;
     if (!renderer() || !renderer()->isSVGRoot())
-        return FloatRect();
+        return SVGRect();
     if (!toRenderSVGRoot(renderer())->isEmbeddedThroughSVGImage())
-        return FloatRect();
+        return SVGRect();
 
     Length intrinsicWidth = this->intrinsicWidth();
     Length intrinsicHeight = this->intrinsicHeight();
     if (!intrinsicWidth.isFixed() || !intrinsicHeight.isFixed())
-        return FloatRect();
+        return SVGRect();
 
     // If no viewBox is specified but non-relative width/height values, then we
     // should always synthesize a viewBox if we're embedded through a SVGImage.
   
-    return FloatRect(FloatPoint(),
FloatSize(floatValueForLength(intrinsicWidth, 0),
floatValueForLength(intrinsicHeight, 0)));
+    return SVGRect(FloatPoint(), FloatSize(floatValueForLength(intrinsicWidth,
0), floatValueForLength(intrinsicHeight, 0)));
 }
 
 FloatSize SVGSVGElement::currentViewportSize() const

[commit-bot: I haz the power, 2013-07-12 21:16:53]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ch.dumez@sisa.samsung.com/19096011/8001

[commit-bot: I haz the power, 2013-07-12 22:32:57]

Retried try job too often on mac_layout_rel for step(s) webkit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_layout...

[commit-bot: I haz the power, 2013-07-13 11:39:27]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ch.dumez@sisa.samsung.com/19096011/8001

[commit-bot: I haz the power, 2013-07-13 12:09:29]

Retried try job too often on mac_layout_rel for step(s) webkit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_layout...

[commit-bot: I haz the power, 2013-07-14 13:11:18]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ch.dumez@sisa.samsung.com/19096011/8001

[commit-bot: I haz the power, 2013-07-14 13:11:23]

Failed to apply patch for Source/core/rendering/svg/SVGTextQuery.h:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/rendering/svg/SVGTextQuery.h
  Hunk #1 FAILED at 20.
  Hunk #2 FAILED at 40.
  2 out of 2 hunks FAILED -- saving rejects to file
Source/core/rendering/svg/SVGTextQuery.h.rej

Patch:       Source/core/rendering/svg/SVGTextQuery.h
Index: Source/core/rendering/svg/SVGTextQuery.h
diff --git a/Source/core/rendering/svg/SVGTextQuery.h
b/Source/core/rendering/svg/SVGTextQuery.h
index
007b5c9e887313cb7ac3dd3a7f0ee58f467737ae..8673026b3fcde5689e633f122ed93f52685a1a2a
100644
--- a/Source/core/rendering/svg/SVGTextQuery.h
+++ b/Source/core/rendering/svg/SVGTextQuery.h
@@ -20,8 +20,8 @@
 #ifndef SVGTextQuery_h
 #define SVGTextQuery_h
 
-#include "core/platform/graphics/FloatRect.h"
 #include "core/rendering/svg/SVGTextFragment.h"
+#include "core/svg/SVGRect.h"
 #include <wtf/Vector.h>
 
 namespace WebCore {
@@ -40,7 +40,7 @@ public:
     FloatPoint startPositionOfCharacter(unsigned position) const;
     FloatPoint endPositionOfCharacter(unsigned position) const;
     float rotationOfCharacter(unsigned position) const;
-    FloatRect extentOfCharacter(unsigned position) const;
+    SVGRect extentOfCharacter(unsigned position) const;
     int characterNumberAtPosition(const FloatPoint&) const;
 
     // Public helper struct. Private classes in SVGTextQuery inherit from it.

[commit-bot: I haz the power, 2013-07-15 06:00:56]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ch.dumez@sisa.samsung.com/19096011/27001

[commit-bot: I haz the power, 2013-07-15 07:26:17]

Change committed as 154204