Changeset 109646 in webkit

Timestamp:

Mar 2, 2012 6:41:36 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

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

Patch by Mike Fenton <​mifenton@rim.com> 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):

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/WebPage.cpp (modified) (1 diff)
• Api/WebPage.h (modified) (1 diff)
• Api/WebSettings.cpp (modified) (3 diffs)
• ChangeLog (modified) (1 diff)

trunk/Source/WebKit/blackberry/Api/WebPage.cpp

@@ -5025 +5025 @@
 }
 
+bool WebPage::isWebInspectorEnabled()
+{
+    return d->m_page->settings()->developerExtrasEnabled();
+}
+
 void WebPage::enablePasswordEcho()
 {

trunk/Source/WebKit/blackberry/Api/WebPage.h

@@ -301 +301 @@
     void enableWebInspector();
     void disableWebInspector();
+    bool isWebInspectorEnabled();
     void enablePasswordEcho();
     void disablePasswordEcho();

trunk/Source/WebKit/blackberry/Api/WebSettings.cpp

@@ -53 +53 @@
 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"));
@@ -83 +84 @@
 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.
@@ -216 +216 @@
     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;

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-03-02  Mike Fenton  <mifenton@rim.com>
+
+        [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  <anilsson@rim.com>