Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / page / ScopedPageLoadDeferrer.cpp

diff --git a/src/third_party/WebKit/Source/core/page/ScopedPageLoadDeferrer.cpp b/src/third_party/WebKit/Source/core/page/ScopedPageLoadDeferrer.cpp
index 4f22326..3d9fcd9 100644 (file)
--- a/src/third_party/WebKit/Source/core/page/ScopedPageLoadDeferrer.cpp
+++ b/src/third_party/WebKit/Source/core/page/ScopedPageLoadDeferrer.cpp
@@ -27,9 +27,7 @@
 #include "core/page/Page.h"
 #include "wtf/HashSet.h"
 
-namespace WebCore {
-
-using namespace std;
+namespace blink {
 
 ScopedPageLoadDeferrer::ScopedPageLoadDeferrer(Page* exclusion)
 {
@@ -41,16 +39,20 @@ ScopedPageLoadDeferrer::ScopedPageLoadDeferrer(Page* exclusion)
         if (page == exclusion || page->defersLoading())
             continue;
 
-        m_deferredFrames.append(page->mainFrame());
+        if (page->mainFrame()->isLocalFrame()) {
+            m_deferredFrames.append(page->deprecatedLocalMainFrame());
 
-        // Ensure that we notify the client if the initial empty document is accessed before
-        // showing anything modal, to prevent spoofs while the modal window or sheet is visible.
-        page->mainFrame()->loader().notifyIfInitialDocumentAccessed();
+            // Ensure that we notify the client if the initial empty document is accessed before
+            // showing anything modal, to prevent spoofs while the modal window or sheet is visible.
+            page->deprecatedLocalMainFrame()->loader().notifyIfInitialDocumentAccessed();
+        }
 
         // This code is not logically part of load deferring, but we do not want JS code executed
         // beneath modal windows or sheets, which is exactly when ScopedPageLoadDeferrer is used.
-        for (LocalFrame* frame = page->mainFrame(); frame; frame = frame->tree().traverseNext())
-            frame->document()->suspendScheduledTasks();
+        for (Frame* frame = page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
+            if (frame->isLocalFrame())
+                toLocalFrame(frame)->document()->suspendScheduledTasks();
+        }
     }
 
     size_t count = m_deferredFrames.size();
@@ -66,10 +68,12 @@ ScopedPageLoadDeferrer::~ScopedPageLoadDeferrer()
         if (Page* page = m_deferredFrames[i]->page()) {
             page->setDefersLoading(false);
 
-            for (LocalFrame* frame = page->mainFrame(); frame; frame = frame->tree().traverseNext())
-                frame->document()->resumeScheduledTasks();
+            for (Frame* frame = page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
+                if (frame->isLocalFrame())
+                    toLocalFrame(frame)->document()->resumeScheduledTasks();
+            }
         }
     }
 }
 
-} // namespace WebCore
+} // namespace blink