Title: [121045] trunk/Source/WebKit/blackberry
Revision
121045
Author
[email protected]
Date
2012-06-22 11:40:18 -0700 (Fri, 22 Jun 2012)

Log Message

[BlackBerry] Set WebSecurityEnabled flag accordingly.
https://bugs.webkit.org/show_bug.cgi?id=89602

Patch by Yong Li <[email protected]> on 2012-06-22
Reviewed by Rob Buis.

Disable web security checks if needed.

* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPagePrivate::init):
(BlackBerry::WebKit::WebPagePrivate::didChangeSettings):

Modified Paths

Diff

Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (121044 => 121045)


--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2012-06-22 18:32:00 UTC (rev 121044)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2012-06-22 18:40:18 UTC (rev 121045)
@@ -564,6 +564,8 @@
     m_page->settings()->setInteractiveFormValidationEnabled(true);
     m_page->settings()->setAllowUniversalAccessFromFileURLs(false);
     m_page->settings()->setAllowFileAccessFromFileURLs(false);
+    m_page->settings()->setShouldUseCrossOriginProtocolCheck(!m_webSettings->allowCrossSiteRequests());
+    m_page->settings()->setWebSecurityEnabled(!m_webSettings->allowCrossSiteRequests());
 
     m_backingStoreClient = BackingStoreClient::create(m_mainFrame, /* parent frame */ 0, m_webPage);
     // The direct access to BackingStore is left here for convenience since it
@@ -6336,6 +6338,7 @@
     coreSettings->setProcessHTTPEquiv(!webSettings->isEmailMode());
 
     coreSettings->setShouldUseCrossOriginProtocolCheck(!webSettings->allowCrossSiteRequests());
+    coreSettings->setWebSecurityEnabled(!webSettings->allowCrossSiteRequests());
 
     cookieManager().setPrivateMode(webSettings->isPrivateBrowsingEnabled());
 

Modified: trunk/Source/WebKit/blackberry/ChangeLog (121044 => 121045)


--- trunk/Source/WebKit/blackberry/ChangeLog	2012-06-22 18:32:00 UTC (rev 121044)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-06-22 18:40:18 UTC (rev 121045)
@@ -1,3 +1,16 @@
+2012-06-22  Yong Li  <[email protected]>
+
+        [BlackBerry] Set WebSecurityEnabled flag accordingly.
+        https://bugs.webkit.org/show_bug.cgi?id=89602
+
+        Reviewed by Rob Buis.
+
+        Disable web security checks if needed.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::init):
+        (BlackBerry::WebKit::WebPagePrivate::didChangeSettings):
+
 2012-06-22  Parth Patel  <[email protected]>
 
         [Blackberry] BlackBerry::Platform::Settings::get() rename to BlackBerry::Platform::Settings::instance() to make it consistent with our other singletons
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to