Changeset 155540 in webkit

Timestamp:

Sep 11, 2013 10:43:14 AM (11 years ago)

Author:

akling@apple.com

Message:

Remove unnecessary Document::frame() null checks in rendererIsNeeded().
<​https://webkit.org/b/121166>

Reviewed by Anders Carlsson.

rendererIsNeeded() is only called during style resolve, which only happens
while there's a Frame present.

• html/HTMLEmbedElement.cpp:

(WebCore::HTMLEmbedElement::rendererIsNeeded):

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::rendererIsNeeded):

• html/HTMLObjectElement.cpp:
• html/HTMLObjectElement.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLEmbedElement.cpp (modified) (2 diffs)
• html/HTMLMediaElement.cpp (modified) (1 diff)
• html/HTMLObjectElement.cpp (modified) (1 diff)
• html/HTMLObjectElement.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-11  Andreas Kling  <akling@apple.com>
+
+        Remove unnecessary Document::frame() null checks in rendererIsNeeded().
+        <https://webkit.org/b/121166>
+
+        Reviewed by Anders Carlsson.
+
+        rendererIsNeeded() is only called during style resolve, which only happens
+        while there's a Frame present.
+
+        * html/HTMLEmbedElement.cpp:
+        (WebCore::HTMLEmbedElement::rendererIsNeeded):
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::rendererIsNeeded):
+        * html/HTMLObjectElement.cpp:
+        * html/HTMLObjectElement.h:
+
 2013-09-11  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebCore/html/HTMLEmbedElement.cpp

@@ -181 +181 @@
         return HTMLPlugInImageElement::rendererIsNeeded(style);
 
-    Frame* frame = document().frame();
-    if (!frame)
-        return false;
-
     // If my parent is an <object> and is not set to use fallback content, I
     // should be ignored and not get a renderer.
@@ -199 +195 @@
 #if ENABLE(DASHBOARD_SUPPORT)
     // Workaround for <rdar://problem/6642221>.
-    if (frame->settings().usesDashboardBackwardCompatibilityMode())
+    if (document().frame()->settings().usesDashboardBackwardCompatibilityMode())
         return true;
 #endif

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -551 +551 @@
 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
     UNUSED_PARAM(context);
-    Frame* frame = document().frame();
-    if (!frame)
-        return false;
-
     return true;
 #else

trunk/Source/WebCore/html/HTMLObjectElement.cpp

@@ -324 +324 @@
 }
 
-bool HTMLObjectElement::rendererIsNeeded(const RenderStyle& style)
-{
-    // FIXME: This check should not be needed, detached documents never render!
-    Frame* frame = document().frame();
-    if (!frame)
-        return false;
-
-    return HTMLPlugInImageElement::rendererIsNeeded(style);
-}
-
 Node::InsertionNotificationRequest HTMLObjectElement::insertedInto(ContainerNode* insertionPoint)
 {

trunk/Source/WebCore/html/HTMLObjectElement.h

@@ -74 +74 @@
     virtual void removedFrom(ContainerNode*) OVERRIDE;
 
-    virtual bool rendererIsNeeded(const RenderStyle&);
     virtual void didMoveToNewDocument(Document* oldDocument) OVERRIDE;