Changeset 158163 in webkit for trunk/Source/WebCore/rendering/RenderWidget.cpp

Timestamp:

Oct 28, 2013, 7:58:43 PM (12 years ago)

Author:

[email protected]

Message:

RenderElement::style() should return a reference.
<​https://webkit.org/b/123414>

Now that renderers always have style, go ahead and make style()
return a RenderStyle&.

There are countless opportunities for further cleanup enabled by
this change. I'm simply passing &style() in many cases where we
can really do something nicer instead.

Reviewed by Anders Carlsson.

File:

• trunk/Source/WebCore/rendering/RenderWidget.cpp (modified) (7 diffs)

trunk/Source/WebCore/rendering/RenderWidget.cpp

@@ -189 +189 @@
         view().frameView().didAddWidgetToRenderTree(*m_widget);
         // If we've already received a layout, apply the calculated space to the
-        // widget immediately, but we have to have really been fully constructed (with a non-null
-        // style pointer).
+        // widget immediately, but we have to have really been fully constructed.
         if (hasInitializedStyle()) {
             if (!needsLayout()) {
@@ -199 +198 @@
             }
 
-            if (style()->visibility() != VISIBLE)
+            if (style().visibility() != VISIBLE)
                 m_widget->hide();
             else {
@@ -225 +224 @@
     RenderReplaced::styleDidChange(diff, oldStyle);
     if (m_widget) {
-        if (style()->visibility() != VISIBLE)
+        if (style().visibility() != VISIBLE)
             m_widget->hide();
         else
@@ -293 +292 @@
 
 #if PLATFORM(MAC)
-    if (style()->highlight() != nullAtom && !paintInfo.context->paintingDisabled())
-        paintCustomHighlight(paintOffset, style()->highlight(), true);
+    if (style().highlight() != nullAtom && !paintInfo.context->paintingDisabled())
+        paintCustomHighlight(paintOffset, style().highlight(), true);
 #endif
 
-    if (style()->hasBorderRadius()) {
+    if (style().hasBorderRadius()) {
         LayoutRect borderRect = LayoutRect(adjustedPaintOffset, size());
 
@@ -305 +304 @@
         // Push a clip if we have a border radius, since we want to round the foreground content that gets painted.
         paintInfo.context->save();
-        RoundedRect roundedInnerRect = style()->getRoundedInnerBorderFor(borderRect,
+        RoundedRect roundedInnerRect = style().getRoundedInnerBorderFor(borderRect,
             paddingTop() + borderTop(), paddingBottom() + borderBottom(), paddingLeft() + borderLeft(), paddingRight() + borderRight(), true, true);
         clipRoundedInnerRect(paintInfo.context, borderRect, roundedInnerRect);
@@ -313 +312 @@
         paintContents(paintInfo, paintOffset);
 
-    if (style()->hasBorderRadius())
+    if (style().hasBorderRadius())
         paintInfo.context->restore();
 
@@ -319 +318 @@
     if (isSelected() && !document().printing()) {
         // FIXME: selectionRect() is in absolute, not painting coordinates.
-        paintInfo.context->fillRect(pixelSnappedIntRect(selectionRect()), selectionBackgroundColor(), style()->colorSpace());
+        paintInfo.context->fillRect(pixelSnappedIntRect(selectionRect()), selectionBackgroundColor(), style().colorSpace());
     }