Title: [151887] trunk/Source/WebCore
- Revision
- 151887
- Author
- [email protected]
- Date
- 2013-06-22 23:24:15 -0700 (Sat, 22 Jun 2013)
Log Message
Remove redundant helper from RenderRegion.
https://bugs.webkit.org/show_bug.cgi?id=117915
Patch by Zalan Bujtas <[email protected]> on 2013-06-22
Reviewed by Andreas Kling.
Minor code cleanup.
* rendering/RenderRegion.cpp:
(WebCore::RenderRegion::regionOversetState):
(WebCore::RenderRegion::setRegionOversetState):
* rendering/RenderRegion.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (151886 => 151887)
--- trunk/Source/WebCore/ChangeLog 2013-06-23 06:14:13 UTC (rev 151886)
+++ trunk/Source/WebCore/ChangeLog 2013-06-23 06:24:15 UTC (rev 151887)
@@ -1,3 +1,17 @@
+2013-06-22 Zalan Bujtas <[email protected]>
+
+ Remove redundant helper from RenderRegion.
+ https://bugs.webkit.org/show_bug.cgi?id=117915
+
+ Reviewed by Andreas Kling.
+
+ Minor code cleanup.
+
+ * rendering/RenderRegion.cpp:
+ (WebCore::RenderRegion::regionOversetState):
+ (WebCore::RenderRegion::setRegionOversetState):
+ * rendering/RenderRegion.h:
+
2013-06-22 Mark Rowe <[email protected]>
Build fix after r151878.
Modified: trunk/Source/WebCore/rendering/RenderRegion.cpp (151886 => 151887)
--- trunk/Source/WebCore/rendering/RenderRegion.cpp 2013-06-23 06:14:13 UTC (rev 151886)
+++ trunk/Source/WebCore/rendering/RenderRegion.cpp 2013-06-23 06:24:15 UTC (rev 151887)
@@ -133,22 +133,23 @@
RegionOversetState RenderRegion::regionOversetState() const
{
- if (isValid() && element())
- return element()->regionOversetState();
+ ASSERT(node());
+
+ if (!isValid())
+ return RegionUndefined;
+
+ if (Element* element = toElement(node()))
+ return element->regionOversetState();
return RegionUndefined;
}
void RenderRegion::setRegionOversetState(RegionOversetState state)
{
- if (element())
- element()->setRegionOversetState(state);
-}
+ ASSERT(node());
-Element* RenderRegion::element() const
-{
- ASSERT(node() && node()->isElementNode());
- return toElement(node());
+ if (Element* element = toElement(node()))
+ element->setRegionOversetState(state);
}
LayoutUnit RenderRegion::pageLogicalTopForOffset(LayoutUnit /* offset */) const
Modified: trunk/Source/WebCore/rendering/RenderRegion.h (151886 => 151887)
--- trunk/Source/WebCore/rendering/RenderRegion.h 2013-06-23 06:14:13 UTC (rev 151886)
+++ trunk/Source/WebCore/rendering/RenderRegion.h 2013-06-23 06:24:15 UTC (rev 151887)
@@ -85,8 +85,6 @@
RegionOversetState regionOversetState() const;
void setRegionOversetState(RegionOversetState);
- Element* element() const;
-
// These methods represent the width and height of a "page" and for a RenderRegion they are just the
// content width and content height of a region. For RenderRegionSets, however, they will be the width and
// height of a single column or page in the set.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
