[webkit-changes] [109646] trunk/Source/WebKit/blackberry

Fri, 02 Mar 2012 18:41:44 -0800

Title: [109646] trunk/Source/WebKit/blackberry
Revision
109646
Author
[email protected]
Date
2012-03-02 18:41:36 -0800 (Fri, 02 Mar 2012)

Log Message

[BlackBerry] Expose WebInspector state to client and clean up WebSettings
https://bugs.webkit.org/show_bug.cgi?id=80177

Patch by Mike Fenton <[email protected]> on 2012-03-02
Reviewed by Antonio Gomes.

Expose the Web Inspector state to WebPage client's and
re-order initialization of WebSettings to be alphabetical
matching their definitions.

* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPage::isWebInspectorEnabled):
* Api/WebPage.h:
* Api/WebSettings.cpp:
(BlackBerry::WebKit::WebSettings::standardSettings):

Modified Paths

Diff

Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (109645 => 109646)


--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2012-03-03 02:35:53 UTC (rev 109645)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2012-03-03 02:41:36 UTC (rev 109646)
@@ -5024,6 +5024,11 @@
     d->m_page->settings()->setDeveloperExtrasEnabled(false);
 }
 
+bool WebPage::isWebInspectorEnabled()
+{
+    return d->m_page->settings()->developerExtrasEnabled();
+}
+
 void WebPage::enablePasswordEcho()
 {
     d->m_page->settings()->setPasswordEchoEnabled(true);

Modified: trunk/Source/WebKit/blackberry/Api/WebPage.h (109645 => 109646)


--- trunk/Source/WebKit/blackberry/Api/WebPage.h	2012-03-03 02:35:53 UTC (rev 109645)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.h	2012-03-03 02:41:36 UTC (rev 109646)
@@ -300,6 +300,7 @@
 
     void enableWebInspector();
     void disableWebInspector();
+    bool isWebInspectorEnabled();
     void enablePasswordEcho();
     void disablePasswordEcho();
     void dispatchInspectorMessage(const std::string& message);

Modified: trunk/Source/WebKit/blackberry/Api/WebSettings.cpp (109645 => 109646)


--- trunk/Source/WebKit/blackberry/Api/WebSettings.cpp	2012-03-03 02:35:53 UTC (rev 109645)
+++ trunk/Source/WebKit/blackberry/Api/WebSettings.cpp	2012-03-03 02:41:36 UTC (rev 109646)
@@ -52,6 +52,7 @@
 DEFINE_STATIC_LOCAL(String, BlackBerryUserScalableEnabled, ("BlackBerryUserScalableEnabled"));
 DEFINE_STATIC_LOCAL(String, BlackBerryViewportWidth, ("BlackBerryViewportWidth"));
 DEFINE_STATIC_LOCAL(String, BlackBerryZoomToFitOnLoadEnabled, ("BlackBerryZoomToFitOnLoadEnabled"));
+DEFINE_STATIC_LOCAL(String, SpatialNavigationEnabled, ("SpatialNavigationEnabled"));
 DEFINE_STATIC_LOCAL(String, WebKitDatabasePath, ("WebKitDatabasePath"));
 DEFINE_STATIC_LOCAL(String, WebKitDatabasesEnabled, ("WebKitDatabasesEnabled"));
 DEFINE_STATIC_LOCAL(String, WebKitDefaultFixedFontSize, ("WebKitDefaultFixedFontSize"));
@@ -82,7 +83,6 @@
 DEFINE_STATIC_LOCAL(String, WebKitUserStyleSheetLocation, ("WebKitUserStyleSheetLocation"));
 DEFINE_STATIC_LOCAL(String, WebKitWebSocketsEnabled, ("WebKitWebSocketsEnabled"));
 DEFINE_STATIC_LOCAL(String, WebKitXSSAuditorEnabled, ("WebKitXSSAuditorEnabled"));
-DEFINE_STATIC_LOCAL(String, SpatialNavigationEnabled, ("SpatialNavigationEnabled"));
 
 // FIXME: We should consider moving all the mime type code into its own object.
 
@@ -215,25 +215,25 @@
     // FIXME: We should detect whether we are embedded in a browser or an email client and default to TextReflowEnabledOnlyForBlockZoom and TextReflowEnabled, respectively.
     settings->m_private->setTextReflowMode(BlackBerryTextReflowMode, TextReflowDisabled);
 
+    settings->m_private->setBoolean(BlackBerryUseWebKitCache, true);
     settings->m_private->setBoolean(BlackBerryUserScalableEnabled, true);
-    settings->m_private->setBoolean(BlackBerryUseWebKitCache, true);
     settings->m_private->setBoolean(BlackBerryZoomToFitOnLoadEnabled, true);
+
     settings->m_private->setInteger(WebKitDefaultFontSize, 16);
     settings->m_private->setInteger(WebKitDefaultFixedFontSize, 13);
-    settings->m_private->setInteger(WebKitMinimumFontSize, 8);
     settings->m_private->setString(WebKitDefaultTextEncodingName, "iso-8859-1");
+    settings->m_private->setBoolean(WebKitDownloadableBinaryFontsEnabled, true);
     settings->m_private->setInteger(WebKitFirstScheduledLayoutDelay, 250); // Match Document::cLayoutScheduleThreshold.
+    settings->m_private->setString(WebKitFixedFontFamily, "Courier New");
     settings->m_private->setBoolean(WebKitJavaScriptEnabled, true);
     settings->m_private->setBoolean(WebKitLoadsImagesAutomatically, true);
-    settings->m_private->setBoolean(WebKitDownloadableBinaryFontsEnabled, true);
     settings->m_private->setUnsignedLongLong(WebKitLocalStorageQuota, 5 * 1024 * 1024);
     settings->m_private->setInteger(WebKitMaximumPagesInCache, 0);
-    settings->m_private->setBoolean(WebKitWebSocketsEnabled, true);
-    settings->m_private->setString(WebKitFixedFontFamily, "Courier New");
+    settings->m_private->setInteger(WebKitMinimumFontSize, 8);
     settings->m_private->setString(WebKitSansSeriffFontFamily, "Arial");
     settings->m_private->setString(WebKitSeriffFontFamily, "Times New Roman");
     settings->m_private->setString(WebKitStandardFontFamily, "Times New Roman");
-    settings->m_private->setBoolean(SpatialNavigationEnabled, false);
+    settings->m_private->setBoolean(WebKitWebSocketsEnabled, true);
 
     return settings;
 }

Modified: trunk/Source/WebKit/blackberry/ChangeLog (109645 => 109646)


--- trunk/Source/WebKit/blackberry/ChangeLog	2012-03-03 02:35:53 UTC (rev 109645)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-03-03 02:41:36 UTC (rev 109646)
@@ -1,3 +1,20 @@
+2012-03-02  Mike Fenton  <[email protected]>
+
+        [BlackBerry] Expose WebInspector state to client and clean up WebSettings
+        https://bugs.webkit.org/show_bug.cgi?id=80177
+
+        Reviewed by Antonio Gomes.
+
+        Expose the Web Inspector state to WebPage client's and
+        re-order initialization of WebSettings to be alphabetical
+        matching their definitions.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPage::isWebInspectorEnabled):
+        * Api/WebPage.h:
+        * Api/WebSettings.cpp:
+        (BlackBerry::WebKit::WebSettings::standardSettings):
+
 2012-03-02  Arvid Nilsson  <[email protected]>
 
         Accelerated compositing: Checkerboard never goes away

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to