Index: public/web/WebSettings.h |
diff --git a/public/web/WebSettings.h b/public/web/WebSettings.h |
index 174b55b1d122a7e7fdec336ba58e1da490c41bf7..b5e3dc4e1111326183f5e5efba8c896bd7e30053 100644 |
--- a/public/web/WebSettings.h |
+++ b/public/web/WebSettings.h |
@@ -74,10 +74,24 @@ public: |
virtual void setAcceleratedCompositingForTransitionEnabled(bool) { }; |
virtual void setAcceleratedCompositingForPluginsEnabled(bool) = 0; |
virtual void setAcceleratedCompositingForVideoEnabled(bool) = 0; |
+ // If set to true, allows frames with an https origin to display passive |
+ // contents at an insecure URL. Otherwise, disallows it. The |
+ // FrameLoaderClient set to the frame may override the value set by this |
+ // method. |
virtual void setAllowDisplayOfInsecureContent(bool) = 0; |
virtual void setAllowFileAccessFromFileURLs(bool) = 0; |
virtual void setAllowCustomScrollbarInMainFrame(bool) = 0; |
+ // If set to true, allows frames with an https origin to run active |
+ // contents at an insecure URL. This includes WebSockets. Otherwise, |
+ // disallows it. The FrameLoaderClient set to the frame may override the |
+ // value set by this method. |
virtual void setAllowRunningOfInsecureContent(bool) = 0; |
+ // If set to true, allows frames with an https origin to connect WebSockets |
+ // with an insecure URL (ws://). Otherwise, disallows it. Only when this is |
+ // set to true, this value overrides the value set by |
+ // setAllowRunningOfInsecureContent() for WebSockets. The FrameLoaderClient |
+ // set to the frame may override the value set by this method. |
+ virtual void setAllowConnectingInsecureWebSocket(bool) = 0; |
virtual void setAllowScriptsToCloseWindows(bool) = 0; |
virtual void setAllowUniversalAccessFromFileURLs(bool) = 0; |
virtual void setAntialiased2dCanvasEnabled(bool) = 0; |