Changeset 121872 in webkit

Timestamp:

Jul 4, 2012 3:06:39 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Implement device metrics for blackberry.
​https://bugs.webkit.org/show_bug.cgi?id=90494
RIM PR #159034

Patch by Hanna Ma <​Hanma@rim.com> on 2012-07-04
Reviewed by Rob Buis.

Implement calls to the application to change the device metrics for
the web inspector.

• Api/WebPage.cpp:

(BlackBerry::WebKit::WebPagePrivate::applySizeOverride):
(WebKit):
(BlackBerry::WebKit::WebPagePrivate::setTextZoomFactor):

• Api/WebPage_p.h:

(WebPagePrivate):

• WebCoreSupport/InspectorClientBlackBerry.cpp:

(WebCore::InspectorClientBlackBerry::InspectorClientBlackBerry):
(WebCore::InspectorClientBlackBerry::canOverrideDeviceMetrics):
(WebCore):
(WebCore::InspectorClientBlackBerry::overrideDeviceMetrics):
(WebCore::InspectorClientBlackBerry::supportsFrameInstrumentation):

• WebCoreSupport/InspectorClientBlackBerry.h:

(InspectorClientBlackBerry):

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/WebPage.cpp (modified) (1 diff)
• Api/WebPageClient.h (modified) (1 diff)
• Api/WebPage_p.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• WebCoreSupport/InspectorClientBlackBerry.cpp (modified) (1 diff)
• WebCoreSupport/InspectorClientBlackBerry.h (modified) (1 diff)

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

@@ -6601 +6601 @@
 }
 
-}
-}
+void WebPagePrivate::applySizeOverride(int overrideWidth, int overrideHeight)
+{
+    m_client->requestUpdateViewport(overrideWidth, overrideHeight);
+}
+
+void WebPagePrivate::setTextZoomFactor(float textZoomFactor)
+{
+    if (!m_mainFrame)
+        return;
+
+    m_mainFrame->setTextZoomFactor(textZoomFactor);
+}
+}
+}

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

@@ -127 +127 @@
     virtual void zoomChanged(bool isMinZoomed, bool isMaxZoomed, bool isAtInitialZoom, double newZoom) const = 0;
 
+    virtual void requestUpdateViewport(int width, int height) = 0;
+
     virtual void setPageTitle(const unsigned short* title, unsigned titleLength) = 0;
 

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

@@ -441 +441 @@
     void setInspectorOverlayClient(WebCore::InspectorOverlay::InspectorOverlayClient*);
 
+    void applySizeOverride(int overrideWidth, int overrideHeight);
+    void setTextZoomFactor(float);
+
     WebPage* m_webPage;
     WebPageClient* m_client;

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-07-04  Hanna Ma  <Hanma@rim.com>
+
+        [BlackBerry] Implement device metrics for blackberry.
+        https://bugs.webkit.org/show_bug.cgi?id=90494
+        RIM PR #159034
+
+        Reviewed by Rob Buis.
+
+        Implement calls to the application to change the device metrics for
+        the web inspector.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::applySizeOverride):
+        (WebKit):
+        (BlackBerry::WebKit::WebPagePrivate::setTextZoomFactor):
+        * Api/WebPage_p.h:
+        (WebPagePrivate):
+        * WebCoreSupport/InspectorClientBlackBerry.cpp:
+        (WebCore::InspectorClientBlackBerry::InspectorClientBlackBerry):
+        (WebCore::InspectorClientBlackBerry::canOverrideDeviceMetrics):
+        (WebCore):
+        (WebCore::InspectorClientBlackBerry::overrideDeviceMetrics):
+        (WebCore::InspectorClientBlackBerry::supportsFrameInstrumentation):
+        * WebCoreSupport/InspectorClientBlackBerry.h:
+        (InspectorClientBlackBerry):
+
 2012-07-03  Leo Yang  <leo.yang@torchmobile.com.cn>
 

trunk/Source/WebKit/blackberry/WebCoreSupport/InspectorClientBlackBerry.cpp

@@ -86 +86 @@
 }
 
+bool InspectorClientBlackBerry::canOverrideDeviceMetrics()
+{
+    return true;
+}
+
+void InspectorClientBlackBerry::overrideDeviceMetrics(int width, int height, float fontScaleFactor, bool)
+{
+    // Note: when width and height = 0, and fontScaleFactor = 1, this is the signal for restoring to default size.
+    m_webPagePrivate->applySizeOverride(width, height);
+    m_webPagePrivate->setTextZoomFactor(fontScaleFactor);
+}
+
+bool InspectorClientBlackBerry::supportsFrameInstrumentation()
+{
+    return true;
+}
+
 void InspectorClientBlackBerry::updateInspectorStateCookie(const String& cookie)
 {

trunk/Source/WebKit/blackberry/WebCoreSupport/InspectorClientBlackBerry.h

@@ -54 +54 @@
     virtual void paintInspectorOverlay(WebCore::GraphicsContext&);
 
+    virtual bool canOverrideDeviceMetrics();
+    virtual void overrideDeviceMetrics(int, int, float, bool);
+    virtual bool supportsFrameInstrumentation();
+
     virtual void updateInspectorStateCookie(const String&);