Title: [155288] trunk/Source/WebCore
- Revision
- 155288
- Author
- [email protected]
- Date
- 2013-09-08 01:15:27 -0700 (Sun, 08 Sep 2013)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (155287 => 155288)
--- trunk/Source/WebCore/ChangeLog 2013-09-08 07:02:42 UTC (rev 155287)
+++ trunk/Source/WebCore/ChangeLog 2013-09-08 08:15:27 UTC (rev 155288)
@@ -1,3 +1,12 @@
+2013-09-08 Andreas Kling <[email protected]>
+
+ 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 <[email protected]>
Separate forward and backward paths in ComposedShadowTreeWalker
Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (155287 => 155288)
--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2013-09-08 07:02:42 UTC (rev 155287)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2013-09-08 08:15:27 UTC (rev 155288)
@@ -507,7 +507,7 @@
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;
}
Modified: trunk/Source/WebCore/loader/FrameLoader.h (155287 => 155288)
--- trunk/Source/WebCore/loader/FrameLoader.h 2013-09-08 07:02:42 UTC (rev 155287)
+++ trunk/Source/WebCore/loader/FrameLoader.h 2013-09-08 08:15:27 UTC (rev 155288)
@@ -97,7 +97,7 @@
ResourceLoadNotifier* notifier() const { return &m_notifer; }
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();
void setupForReplace();
Modified: trunk/Source/WebCore/loader/SubframeLoader.cpp (155287 => 155288)
--- trunk/Source/WebCore/loader/SubframeLoader.cpp 2013-09-08 07:02:42 UTC (rev 155287)
+++ trunk/Source/WebCore/loader/SubframeLoader.cpp 2013-09-08 08:15:27 UTC (rev 155288)
@@ -134,7 +134,7 @@
return false;
}
- if (!m_frame->loader().mixedContentChecker()->canRunInsecureContent(document()->securityOrigin(), url))
+ if (!m_frame->loader().mixedContentChecker().canRunInsecureContent(document()->securityOrigin(), url))
return false;
}
@@ -263,7 +263,7 @@
else if (mediaElement->isVideo())
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;
RefPtr<Widget> widget = m_frame->loader().client().createMediaPlayerProxyPlugin(size, mediaElement, completedURL,
Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (155287 => 155288)
--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2013-09-08 07:02:42 UTC (rev 155287)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2013-09-08 08:15:27 UTC (rev 155288)
@@ -272,7 +272,7 @@
// These resource can inject script into the current document (Script,
// 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;
#if ENABLE(VIDEO_TRACK)
@@ -287,7 +287,7 @@
// These resources can corrupt only the frame's pixels.
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;
}
break;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
