Changeset 86201 in webkit

Timestamp:

May 10, 2011 6:24:16 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-05-10 Chris Evans <​cevans@chromium.org>

Reviewed by Adam Barth.

Add WebCore::Setting to block displaying and/or running insecure content on secure pages
​https://bugs.webkit.org/show_bug.cgi?id=58378

• DumpRenderTree/chromium/LayoutTestController.cpp: (LayoutTestController::LayoutTestController): (LayoutTestController::setAllowDisplayOfInsecureContent): (LayoutTestController::setAllowRunningOfInsecureContent):
• DumpRenderTree/chromium/LayoutTestController.h:
• DumpRenderTree/chromium/WebPreferences.cpp: (WebPreferences::reset): (WebPreferences::applyTo):
• DumpRenderTree/chromium/WebPreferences.h: Add plumbing for new settings to Chromium DRT.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/chromium/LayoutTestController.cpp (modified) (2 diffs)
• DumpRenderTree/chromium/LayoutTestController.h (modified) (1 diff)
• DumpRenderTree/chromium/WebPreferences.cpp (modified) (2 diffs)
• DumpRenderTree/chromium/WebPreferences.h (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-05-10  Chris Evans  <cevans@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Add WebCore::Setting to block displaying and/or running insecure content on secure pages
+        https://bugs.webkit.org/show_bug.cgi?id=58378
+
+        * DumpRenderTree/chromium/LayoutTestController.cpp:
+        (LayoutTestController::LayoutTestController):
+        (LayoutTestController::setAllowDisplayOfInsecureContent):
+        (LayoutTestController::setAllowRunningOfInsecureContent):
+        * DumpRenderTree/chromium/LayoutTestController.h:
+        * DumpRenderTree/chromium/WebPreferences.cpp:
+        (WebPreferences::reset):
+        (WebPreferences::applyTo):
+        * DumpRenderTree/chromium/WebPreferences.h:
+        Add plumbing for new settings to Chromium DRT.
+
 2011-05-10  Enrica Casucci  <enrica@apple.com>
 

trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp

@@ -139 +139 @@
     bindMethod("sampleSVGAnimationForElementAtTime", &LayoutTestController::sampleSVGAnimationForElementAtTime);
     bindMethod("setAcceptsEditing", &LayoutTestController::setAcceptsEditing);
+    bindMethod("setAllowDisplayOfInsecureContent", &LayoutTestController::setAllowDisplayOfInsecureContent);
     bindMethod("setAllowFileAccessFromFileURLs", &LayoutTestController::setAllowFileAccessFromFileURLs);
+    bindMethod("setAllowRunningOfInsecureContent", &LayoutTestController::setAllowRunningOfInsecureContent);
     bindMethod("setAllowUniversalAccessFromFileURLs", &LayoutTestController::setAllowUniversalAccessFromFileURLs);
     bindMethod("setAlwaysAcceptCookies", &LayoutTestController::setAlwaysAcceptCookies);
@@ -1283 +1285 @@
 }
 
+void LayoutTestController::setAllowDisplayOfInsecureContent(const CppArgumentList& arguments, CppVariant* result)
+{
+    if (arguments.size() > 0 && arguments[0].isBool()) {
+        m_shell->preferences()->allowDisplayOfInsecureContent = arguments[0].value.boolValue;
+        m_shell->applyPreferences();
+    }
+    result->setNull();
+}
+
 void LayoutTestController::setAllowFileAccessFromFileURLs(const CppArgumentList& arguments, CppVariant* result)
 {
     if (arguments.size() > 0 && arguments[0].isBool()) {
         m_shell->preferences()->allowFileAccessFromFileURLs = arguments[0].value.boolValue;
+        m_shell->applyPreferences();
+    }
+    result->setNull();
+}
+
+void LayoutTestController::setAllowRunningOfInsecureContent(const CppArgumentList& arguments, CppVariant* result)
+{
+    if (arguments.size() > 0 && arguments[0].isBool()) {
+        m_shell->preferences()->allowRunningOfInsecureContent = arguments[0].value.boolValue;
         m_shell->applyPreferences();
     }

trunk/Tools/DumpRenderTree/chromium/LayoutTestController.h

@@ -270 +270 @@
     void overridePreference(const CppArgumentList&, CppVariant*);
     void setAllowUniversalAccessFromFileURLs(const CppArgumentList&, CppVariant*);
+    void setAllowDisplayOfInsecureContent(const CppArgumentList&, CppVariant*);
     void setAllowFileAccessFromFileURLs(const CppArgumentList&, CppVariant*);
+    void setAllowRunningOfInsecureContent(const CppArgumentList&, CppVariant*);
 
     void shadowRoot(const CppArgumentList&, CppVariant*);

trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp

@@ -71 +71 @@
     DOMPasteAllowed = true;
     XSSAuditorEnabled = false;
+    allowDisplayOfInsecureContent = true;
     allowFileAccessFromFileURLs = true;
+    allowRunningOfInsecureContent = true;
     authorAndUserStylesEnabled = true;
     defaultTextEncodingName = WebString::fromUTF8("ISO-8859-1");
@@ -128 +130 @@
     settings->setDOMPasteAllowed(DOMPasteAllowed);
     settings->setXSSAuditorEnabled(XSSAuditorEnabled);
+    settings->setAllowDisplayOfInsecureContent(allowDisplayOfInsecureContent);
     settings->setAllowFileAccessFromFileURLs(allowFileAccessFromFileURLs);
+    settings->setAllowRunningOfInsecureContent(allowRunningOfInsecureContent);
     settings->setAuthorAndUserStylesEnabled(authorAndUserStylesEnabled);
     settings->setDefaultTextEncodingName(defaultTextEncodingName);

trunk/Tools/DumpRenderTree/chromium/WebPreferences.h

@@ -55 +55 @@
     bool DOMPasteAllowed;
     bool XSSAuditorEnabled;
+    bool allowDisplayOfInsecureContent;
     bool allowFileAccessFromFileURLs;
+    bool allowRunningOfInsecureContent;
     bool authorAndUserStylesEnabled;
     WebKit::WebString defaultTextEncodingName;