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

Timestamp:

Sep 15, 2013, 5:52:58 AM (12 years ago)

Author:

[email protected]

Message:

CTTE: RenderWidgets are never anonymous.
<​https://webkit.org/b/121385>

Reviewed by Anders Carlsson.

Codify the following:

• RenderWidget always has an HTMLFrameOwnerElement.
• RenderEmbeddedObject always has an HTMLFrameOwnerElement.
• RenderSnapshottedPlugIn always has an HTMLPlugInImageElement.
• RenderFrame always has an HTMLFrameElement.
• RenderIFrame always has an HTMLIFrameElement.

None of these renderers are ever anonymous, so delete element() and provide
strongly typed reference getters instead.

File:

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

trunk/Source/WebCore/rendering/RenderWidget.cpp

@@ -89 +89 @@
 }
 
-RenderWidget::RenderWidget(HTMLFrameOwnerElement* element)
-    : RenderReplaced(element)
+RenderWidget::RenderWidget(HTMLFrameOwnerElement& element)
+    : RenderReplaced(&element)
     , m_weakPtrFactory(this)
     , m_widget(0)
-    , m_frameView(element->document().view())
+    , m_frameView(element.document().view())
 {
     setInline(false);
@@ -124 +124 @@
 bool RenderWidget::setWidgetGeometry(const LayoutRect& frame)
 {
-    if (!frameOwnerElement())
-        return false;
-
     IntRect clipRect = roundedIntRect(enclosingLayer()->childrenClipRect());
     IntRect newFrame = roundedIntRect(frame);
@@ -340 +337 @@
 void RenderWidget::updateWidgetPosition()
 {
-    if (!m_widget || !frameOwnerElement()) // Check the node in case destroy() has been called.
+    if (!m_widget)
         return;
 
@@ -409 +406 @@
 
     // Check to see if we are really over the widget itself (and not just in the border/padding area).
-    if ((inside || result.isRectBasedTest()) && !hadResult && result.innerNode() == frameOwnerElement())
+    if ((inside || result.isRectBasedTest()) && !hadResult && result.innerNode() == &frameOwnerElement())
         result.setIsOverWidget(contentBoxRect().contains(result.localPoint()));
     return inside;
@@ -439 +436 @@
         return true;
 
-    if (!frameOwnerElement())
-        return false;
-
-    if (Document* contentDocument = frameOwnerElement()->contentDocument()) {
+    if (Document* contentDocument = frameOwnerElement().contentDocument()) {
         if (RenderView* view = contentDocument->renderView())
             return view->usesCompositing();
@@ -460 +454 @@
 RenderBox* RenderWidget::embeddedContentBox() const
 {
-    if (!frameOwnerElement() || !widget() || !widget()->isFrameView())
+    if (!widget() || !widget()->isFrameView())
         return 0;
     return toFrameView(widget())->embeddedContentBox();