Title: [89376] trunk/Source/WebKit/chromium
- Revision
- 89376
- Author
- commit-qu...@webkit.org
- Date
- 2011-06-21 13:54:39 -0700 (Tue, 21 Jun 2011)
Log Message
2011-06-21 Chris Evans <cev...@chromium.org>
Reviewed by Darin Fisher.
Wire in checkIfRunInsecureContent to the chromium WebKit API
https://bugs.webkit.org/show_bug.cgi?id=63026
* public/WebFrame.h:
* src/WebFrameImpl.cpp:
(WebKit::WebFrameImpl::checkIfRunInsecureContent): add in basic plumbing.
* src/WebFrameImpl.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (89375 => 89376)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-06-21 20:42:27 UTC (rev 89375)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-06-21 20:54:39 UTC (rev 89376)
@@ -1,3 +1,15 @@
+2011-06-21 Chris Evans <cev...@chromium.org>
+
+ Reviewed by Darin Fisher.
+
+ Wire in checkIfRunInsecureContent to the chromium WebKit API
+ https://bugs.webkit.org/show_bug.cgi?id=63026
+
+ * public/WebFrame.h:
+ * src/WebFrameImpl.cpp:
+ (WebKit::WebFrameImpl::checkIfRunInsecureContent): add in basic plumbing.
+ * src/WebFrameImpl.h:
+
2011-06-21 Ryosuke Niwa <rn...@webkit.org>
Rolled DEPS.
Modified: trunk/Source/WebKit/chromium/public/WebFrame.h (89375 => 89376)
--- trunk/Source/WebKit/chromium/public/WebFrame.h 2011-06-21 20:42:27 UTC (rev 89375)
+++ trunk/Source/WebKit/chromium/public/WebFrame.h 2011-06-21 20:54:39 UTC (rev 89376)
@@ -272,6 +272,10 @@
// Calls window.gc() if it is defined.
virtual void collectGarbage() = 0;
+ // Check if the scripting URL represents a mixed content condition relative
+ // to this frame.
+ virtual bool checkIfRunInsecureContent(const WebURL&) const = 0;
+
#if WEBKIT_USING_V8
// Executes script in the context of the current page and returns the value
// that the script evaluated to.
Modified: trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp (89375 => 89376)
--- trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp 2011-06-21 20:42:27 UTC (rev 89375)
+++ trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp 2011-06-21 20:54:39 UTC (rev 89376)
@@ -848,6 +848,12 @@
#endif
}
+bool WebFrameImpl::checkIfRunInsecureContent(const WebURL& url) const
+{
+ FrameLoader* frameLoader = m_frame->loader();
+ return frameLoader->checkIfRunInsecureContent(m_frame->document()->securityOrigin(), url);
+}
+
#if USE(V8)
v8::Handle<v8::Value> WebFrameImpl::executeScriptAndReturnValue(const WebScriptSource& source)
{
Modified: trunk/Source/WebKit/chromium/src/WebFrameImpl.h (89375 => 89376)
--- trunk/Source/WebKit/chromium/src/WebFrameImpl.h 2011-06-21 20:42:27 UTC (rev 89375)
+++ trunk/Source/WebKit/chromium/src/WebFrameImpl.h 2011-06-21 20:54:39 UTC (rev 89376)
@@ -115,6 +115,7 @@
virtual void setIsolatedWorldSecurityOrigin(int worldID, const WebSecurityOrigin&);
virtual void addMessageToConsole(const WebConsoleMessage&);
virtual void collectGarbage();
+ virtual bool checkIfRunInsecureContent(const WebURL&) const;
#if WEBKIT_USING_V8
virtual v8::Handle<v8::Value> executeScriptAndReturnValue(
const WebScriptSource&);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
