Changeset 155821 in webkit for trunk/Source/WebCore/rendering/RenderFrameSet.cpp

Timestamp:

Sep 15, 2013, 12:00:57 PM (12 years ago)

Author:

[email protected]

Message:

CTTE: RenderFrameSet is never anonymous.
<​https://webkit.org/b/121396>

Reviewed by Antti Koivisto.

This renderer is never anonymous, and always has a corresponding HTMLFrameSetElement.
Replaced element() with a frameSetElement().

File:

• trunk/Source/WebCore/rendering/RenderFrameSet.cpp (modified) (15 diffs)

trunk/Source/WebCore/rendering/RenderFrameSet.cpp

@@ -45 +45 @@
 namespace WebCore {
 
-RenderFrameSet::RenderFrameSet(HTMLFrameSetElement* frameSet)
-    : RenderBox(frameSet)
+RenderFrameSet::RenderFrameSet(HTMLFrameSetElement& frameSet)
+    : RenderBox(&frameSet)
     , m_isResizing(false)
     , m_isChildResizing(false)
@@ -57 +57 @@
 }
 
+HTMLFrameSetElement& RenderFrameSet::frameSetElement() const
+{
+    return toHTMLFrameSetElement(*RenderBox::element());
+}
+
 RenderFrameSet::GridAxis::GridAxis()
     : m_splitBeingResized(noSplit)
 {
-}
-
-inline HTMLFrameSetElement* RenderFrameSet::frameSet() const
-{
-    return toHTMLFrameSetElement(element());
 }
 
@@ -92 +92 @@
     GraphicsContext* context = paintInfo.context;
     ColorSpace colorSpace = style()->colorSpace();
-    context->fillRect(borderRect, frameSet()->hasBorderColor() ? style()->visitedDependentColor(CSSPropertyBorderLeftColor) : borderFillColor(), colorSpace);
+    context->fillRect(borderRect, frameSetElement().hasBorderColor() ? style()->visitedDependentColor(CSSPropertyBorderLeftColor) : borderFillColor(), colorSpace);
     
     // Now stroke the edges but only if we have enough room to paint both edges with a little
@@ -112 +112 @@
     GraphicsContext* context = paintInfo.context;
     ColorSpace colorSpace = style()->colorSpace();
-    context->fillRect(borderRect, frameSet()->hasBorderColor() ? style()->visitedDependentColor(CSSPropertyBorderLeftColor) : borderFillColor(), colorSpace);
+    context->fillRect(borderRect, frameSetElement().hasBorderColor() ? style()->visitedDependentColor(CSSPropertyBorderLeftColor) : borderFillColor(), colorSpace);
 
     // Now stroke the edges but only if we have enough room to paint both edges with a little
@@ -135 +135 @@
     size_t rows = m_rows.m_sizes.size();
     size_t cols = m_cols.m_sizes.size();
-    LayoutUnit borderThickness = frameSet()->border();
+    LayoutUnit borderThickness = frameSetElement().border();
     
     LayoutUnit yPos = 0;
@@ -395 +395 @@
 void RenderFrameSet::computeEdgeInfo()
 {
-    m_rows.m_preventResize.fill(frameSet()->noResize());    
+    m_rows.m_preventResize.fill(frameSetElement().noResize());
     m_rows.m_allowBorder.fill(false);
-    m_cols.m_preventResize.fill(frameSet()->noResize());    
+    m_cols.m_preventResize.fill(frameSetElement().noResize());
     m_cols.m_allowBorder.fill(false);
     
@@ -423 +423 @@
 FrameEdgeInfo RenderFrameSet::edgeInfo() const
 {
-    FrameEdgeInfo result(frameSet()->noResize(), true);
-    
-    int rows = frameSet()->totalRows();
-    int cols = frameSet()->totalCols();
+    FrameEdgeInfo result(frameSetElement().noResize(), true);
+    
+    int rows = frameSetElement().totalRows();
+    int cols = frameSetElement().totalCols();
     if (rows && cols) {
         result.setPreventResize(LeftFrameEdge, m_cols.m_preventResize[0]);
@@ -459 +459 @@
     }
 
-    unsigned cols = frameSet()->totalCols();
-    unsigned rows = frameSet()->totalRows();
+    unsigned cols = frameSetElement().totalCols();
+    unsigned rows = frameSetElement().totalRows();
 
     if (m_rows.m_sizes.size() != rows || m_cols.m_sizes.size() != cols) {
@@ -467 +467 @@
     }
 
-    LayoutUnit borderThickness = frameSet()->border();
-    layOutAxis(m_rows, frameSet()->rowLengths(), height() - (rows - 1) * borderThickness);
-    layOutAxis(m_cols, frameSet()->colLengths(), width() - (cols - 1) * borderThickness);
+    LayoutUnit borderThickness = frameSetElement().border();
+    layOutAxis(m_rows, frameSetElement().rowLengths(), height() - (rows - 1) * borderThickness);
+    layOutAxis(m_cols, frameSetElement().colLengths(), width() - (cols - 1) * borderThickness);
 
     if (flattenFrameSet())
@@ -498 +498 @@
         return;
 
-    int rows = frameSet()->totalRows();
-    int cols = frameSet()->totalCols();
+    int rows = frameSetElement().totalRows();
+    int cols = frameSetElement().totalCols();
 
     int yPos = 0;
-    int borderThickness = frameSet()->border();
+    int borderThickness = frameSetElement().border();
     for (int r = 0; r < rows; r++) {
         int xPos = 0;
@@ -541 +541 @@
         return;
 
-    int rows = frameSet()->totalRows();
-    int cols = frameSet()->totalCols();
-
-    int borderThickness = frameSet()->border();
+    int rows = frameSetElement().totalRows();
+    int cols = frameSetElement().totalCols();
+
+    int borderThickness = frameSetElement().border();
     bool repaintNeeded = false;
 
@@ -558 +558 @@
             int width = m_cols.m_sizes[c];
 
-            bool fixedWidth = frameSet()->colLengths() && frameSet()->colLengths()[c].isFixed();
-            bool fixedHeight = frameSet()->rowLengths() && frameSet()->rowLengths()[r].isFixed();
+            bool fixedWidth = frameSetElement().colLengths() && frameSetElement().colLengths()[c].isFixed();
+            bool fixedHeight = frameSetElement().rowLengths() && frameSetElement().rowLengths()[r].isFixed();
 
             // has to be resized and itself resize its contents
@@ -713 +713 @@
             toRenderFrameSet(ancestor)->m_isChildResizing = isResizing;
     }
-    frame().eventHandler().setResizingFrameSet(isResizing ? frameSet() : 0);
+    frame().eventHandler().setResizingFrameSet(isResizing ? &frameSetElement() : 0);
 }
 
@@ -743 +743 @@
         return 0;
 
-    int borderThickness = frameSet()->border();
+    int borderThickness = frameSetElement().border();
 
     int size = axis.m_sizes.size();
@@ -760 +760 @@
         return noSplit;
 
-    int borderThickness = frameSet()->border();
+    int borderThickness = frameSetElement().border();
     if (borderThickness <= 0)
         return noSplit;