Changeset 155288 in webkit

Timestamp:

Sep 8, 2013 1:15:27 AM (11 years ago)

Author:

akling@apple.com

Message:

FrameLoader::mixedContentChecker() should return a reference.
<​https://webkit.org/b/120992>

Reviewed by Antti Koivisto.

This function was already just returning the address of a member variable.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/DocumentLoader.cpp (modified) (1 diff)
• loader/FrameLoader.h (modified) (1 diff)
• loader/SubframeLoader.cpp (modified) (2 diffs)
• loader/cache/CachedResourceLoader.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-08  Andreas Kling  <akling@apple.com>
+
+        FrameLoader::mixedContentChecker() should return a reference.
+        <https://webkit.org/b/120992>
+
+        Reviewed by Antti Koivisto.
+
+        This function was already just returning the address of a member variable.
+
 2013-09-07  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/loader/DocumentLoader.cpp

@@ -508 +508 @@
     Frame* top = m_frame->tree().top();
     if (top != m_frame) {
-        if (!frameLoader()->mixedContentChecker()->canDisplayInsecureContent(top->document()->securityOrigin(), newRequest.url())) {
+        if (!frameLoader()->mixedContentChecker().canDisplayInsecureContent(top->document()->securityOrigin(), newRequest.url())) {
             cancelMainResourceLoad(frameLoader()->cancelledError(newRequest));
             return;

trunk/Source/WebCore/loader/FrameLoader.h

@@ -98 +98 @@
     SubframeLoader& subframeLoader() const { return *m_subframeLoader; }
     IconController* icon() const { return m_icon.get(); }
-    MixedContentChecker* mixedContentChecker() const { return &m_mixedContentChecker; }
+    MixedContentChecker& mixedContentChecker() const { return m_mixedContentChecker; }
 
     void prepareForHistoryNavigation();

trunk/Source/WebCore/loader/SubframeLoader.cpp

@@ -135 +135 @@
         }
 
-        if (!m_frame->loader().mixedContentChecker()->canRunInsecureContent(document()->securityOrigin(), url))
+        if (!m_frame->loader().mixedContentChecker().canRunInsecureContent(document()->securityOrigin(), url))
             return false;
     }
@@ -264 +264 @@
         size = RenderVideo::defaultSize();
 
-    if (!m_frame->loader().mixedContentChecker()->canRunInsecureContent(m_frame->document()->securityOrigin(), completedURL))
+    if (!m_frame->loader().mixedContentChecker().canRunInsecureContent(m_frame->document()->securityOrigin(), completedURL))
         return 0;
 

trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp

@@ -273 +273 @@
         // XSL) or exfiltrate the content of the current document (CSS).
         if (Frame* f = frame())
-            if (!f->loader().mixedContentChecker()->canRunInsecureContent(m_document->securityOrigin(), url))
+            if (!f->loader().mixedContentChecker().canRunInsecureContent(m_document->securityOrigin(), url))
                 return false;
         break;
@@ -288 +288 @@
         if (Frame* f = frame()) {
             Frame* top = f->tree().top();
-            if (!top->loader().mixedContentChecker()->canDisplayInsecureContent(top->document()->securityOrigin(), url))
+            if (!top->loader().mixedContentChecker().canDisplayInsecureContent(top->document()->securityOrigin(), url))
                 return false;
         }