Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(291)

Side by Side Diff: Source/web/WebLocalFrameImpl.cpp

Issue 598533003: Revert "Mixed Content: Make MixedContentChecker completely static." (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/modules/websockets/NewWebSocketChannelImpl.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 #include "core/html/HTMLInputElement.h" 124 #include "core/html/HTMLInputElement.h"
125 #include "core/html/HTMLLinkElement.h" 125 #include "core/html/HTMLLinkElement.h"
126 #include "core/html/PluginDocument.h" 126 #include "core/html/PluginDocument.h"
127 #include "core/inspector/ConsoleMessage.h" 127 #include "core/inspector/ConsoleMessage.h"
128 #include "core/inspector/InspectorController.h" 128 #include "core/inspector/InspectorController.h"
129 #include "core/inspector/ScriptCallStack.h" 129 #include "core/inspector/ScriptCallStack.h"
130 #include "core/loader/DocumentLoader.h" 130 #include "core/loader/DocumentLoader.h"
131 #include "core/loader/FrameLoadRequest.h" 131 #include "core/loader/FrameLoadRequest.h"
132 #include "core/loader/FrameLoader.h" 132 #include "core/loader/FrameLoader.h"
133 #include "core/loader/HistoryItem.h" 133 #include "core/loader/HistoryItem.h"
134 #include "core/loader/MixedContentChecker.h"
135 #include "core/loader/SubstituteData.h" 134 #include "core/loader/SubstituteData.h"
136 #include "core/page/Chrome.h" 135 #include "core/page/Chrome.h"
137 #include "core/page/EventHandler.h" 136 #include "core/page/EventHandler.h"
138 #include "core/page/FocusController.h" 137 #include "core/page/FocusController.h"
139 #include "core/page/FrameTree.h" 138 #include "core/page/FrameTree.h"
140 #include "core/page/Page.h" 139 #include "core/page/Page.h"
141 #include "core/page/PrintContext.h" 140 #include "core/page/PrintContext.h"
142 #include "core/rendering/HitTestResult.h" 141 #include "core/rendering/HitTestResult.h"
143 #include "core/rendering/RenderBox.h" 142 #include "core/rendering/RenderBox.h"
144 #include "core/rendering/RenderFrame.h" 143 #include "core/rendering/RenderFrame.h"
(...skipping 626 matching lines...) Expand 10 before | Expand all | Expand 10 after
771 if (!frame()) 770 if (!frame())
772 return; 771 return;
773 if (!frame()->settings()->scriptEnabled()) 772 if (!frame()->settings()->scriptEnabled())
774 return; 773 return;
775 V8GCController::collectGarbage(v8::Isolate::GetCurrent()); 774 V8GCController::collectGarbage(v8::Isolate::GetCurrent());
776 } 775 }
777 776
778 bool WebLocalFrameImpl::checkIfRunInsecureContent(const WebURL& url) const 777 bool WebLocalFrameImpl::checkIfRunInsecureContent(const WebURL& url) const
779 { 778 {
780 ASSERT(frame()); 779 ASSERT(frame());
781 return !MixedContentChecker::shouldBlockFetch(frame(), WebURLRequest::Reques tContextIframe, WebURLRequest::FrameTypeNested, url); 780 return frame()->loader().mixedContentChecker()->canFrameInsecureContent(fram e()->document()->securityOrigin(), url);
782 } 781 }
783 782
784 v8::Handle<v8::Value> WebLocalFrameImpl::executeScriptAndReturnValue(const WebSc riptSource& source) 783 v8::Handle<v8::Value> WebLocalFrameImpl::executeScriptAndReturnValue(const WebSc riptSource& source)
785 { 784 {
786 ASSERT(frame()); 785 ASSERT(frame());
787 786
788 TextPosition position(OrdinalNumber::fromOneBasedInt(source.startLine), Ordi nalNumber::first()); 787 TextPosition position(OrdinalNumber::fromOneBasedInt(source.startLine), Ordi nalNumber::first());
789 return frame()->script().executeScriptInMainWorldAndReturnValue(ScriptSource Code(source.code, source.url, position)); 788 return frame()->script().executeScriptInMainWorldAndReturnValue(ScriptSource Code(source.code, source.url, position));
790 } 789 }
791 790
(...skipping 1121 matching lines...) Expand 10 before | Expand all | Expand 10 after
1913 1912
1914 void WebLocalFrameImpl::invalidateAll() const 1913 void WebLocalFrameImpl::invalidateAll() const
1915 { 1914 {
1916 ASSERT(frame() && frame()->view()); 1915 ASSERT(frame() && frame()->view());
1917 FrameView* view = frame()->view(); 1916 FrameView* view = frame()->view();
1918 view->invalidateRect(view->frameRect()); 1917 view->invalidateRect(view->frameRect());
1919 invalidateScrollbar(); 1918 invalidateScrollbar();
1920 } 1919 }
1921 1920
1922 } // namespace blink 1921 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/websockets/NewWebSocketChannelImpl.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698