Changeset 125815 in webkit

Timestamp:

Aug 16, 2012 3:29:48 PM (12 years ago)

Author:

abarth@webkit.org

Message:

Null checks of m_frame->document()->domWindow() aren't needed
​https://bugs.webkit.org/show_bug.cgi?id=94052

Reviewed by Eric Seidel.

If a document is attached to a frame, then its DOMWindow is necessarily
non-0. Checking for 0 is needless.

• loader/DocumentLoader.cpp:

(WebCore::DocumentLoader::checkLoadComplete):

• loader/FrameLoader.cpp:

(WebCore::FrameLoader::stopLoading):
(WebCore::FrameLoader::didOpenURL):
(WebCore::FrameLoader::prepareForCachedPageRestore):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/DocumentLoader.cpp (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-16  Adam Barth  <abarth@webkit.org>
+
+        Null checks of m_frame->document()->domWindow() aren't needed
+        https://bugs.webkit.org/show_bug.cgi?id=94052
+
+        Reviewed by Eric Seidel.
+
+        If a document is attached to a frame, then its DOMWindow is necessarily
+        non-0. Checking for 0 is needless.
+
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::checkLoadComplete):
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::stopLoading):
+        (WebCore::FrameLoader::didOpenURL):
+        (WebCore::FrameLoader::prepareForCachedPageRestore):
+
 2012-08-16  Max Feil  <mfeil@rim.com>
 

trunk/Source/WebCore/loader/DocumentLoader.cpp

@@ -429 +429 @@
         return;
     ASSERT(this == frameLoader()->activeDocumentLoader());
-
-    if (DOMWindow* window = m_frame->document()->domWindow())
-        window->finishedLoading();
+    m_frame->document()->domWindow()->finishedLoading();
 }
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -360 +360 @@
                 if (currentFocusedNode)
                     currentFocusedNode->aboutToUnload();
-                if (m_frame->document()->domWindow() && m_pageDismissalEventBeingDispatched == NoDismissal) {
+                if (m_pageDismissalEventBeingDispatched == NoDismissal) {
                     if (unloadEventPolicy == UnloadEventPolicyUnloadAndPageHide) {
                         m_pageDismissalEventBeingDispatched = PageHideDismissal;
@@ -467 +467 @@
     // since it may cause clients to attempt to render the frame.
     if (!m_stateMachine.creatingInitialEmptyDocument()) {
-        if (DOMWindow* window = m_frame->document()->domWindow()) {
-            window->setStatus(String());
-            window->setDefaultStatus(String());
-        }
+        DOMWindow* window = m_frame->document()->domWindow();
+        window->setStatus(String());
+        window->setDefaultStatus(String());
     }
 
@@ -1913 +1912 @@
     // Delete old status bar messages (if it _was_ activated on last URL).
     if (m_frame->script()->canExecuteScripts(NotAboutToExecuteScript)) {
-        if (DOMWindow* window = m_frame->document()->domWindow()) {
-            window->setStatus(String());
-            window->setDefaultStatus(String());
-        }
+        DOMWindow* window = m_frame->document()->domWindow();
+        window->setStatus(String());
+        window->setDefaultStatus(String());
     }
 }