Changeset 109592 in webkit

Timestamp:

Mar 2, 2012 11:48:17 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

​https://bugs.webkit.org/show_bug.cgi?id=80161
PR: 141157

BlackBerryPlatformScreen.h API has been updated. Reflect those
changes in our usage.

Source/WebCore:

Patch by Adam Treat <​atreat@rim.com> on 2012-03-02
Reviewed by Antonio Gomes.
Internally reviewed by Jakob Petsovits

• platform/blackberry/PlatformScreenBlackBerry.cpp:

(WebCore::screenAvailableRect):
(WebCore::screenRect):

Source/WebKit/blackberry:

Patch by Adam Treat <​atreat@rim.com> on 2012-03-02
Reviewed by Antonio Gomes.
Internally reviewed by Jakob Petsovits.

• Api/BackingStore.cpp:

(BlackBerry::WebKit::BackingStorePrivate::tileWidth):
(BlackBerry::WebKit::BackingStorePrivate::tileHeight):

• Api/WebPage.cpp:

(BlackBerry::WebKit::WebPagePrivate::init):
(BlackBerry::WebKit::WebPagePrivate::transformedViewportSize):
(BlackBerry::WebKit::WebPagePrivate::fixedLayoutSize):
(BlackBerry::WebKit::WebPagePrivate::recomputeVirtualViewportFromViewportArguments):
(BlackBerry::WebKit::WebPagePrivate::setDefaultLayoutSize):
(BlackBerry::WebKit::WebPagePrivate::defaultMaxLayoutSize):

• WebCoreSupport/FrameLoaderClientBlackBerry.cpp:

(WebCore::FrameLoaderClientBlackBerry::restoreViewState):

• WebKitSupport/SurfacePool.cpp:

(BlackBerry::WebKit::createCompositingSurface):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/blackberry/PlatformScreenBlackBerry.cpp (modified) (1 diff)
• WebKit/blackberry/Api/BackingStore.cpp (modified) (2 diffs)
• WebKit/blackberry/Api/WebPage.cpp (modified) (6 diffs)
• WebKit/blackberry/ChangeLog (modified) (1 diff)
• WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp (modified) (1 diff)
• WebKit/blackberry/WebKitSupport/SurfacePool.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-02  Adam Treat  <atreat@rim.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=80161
+        PR: 141157
+
+        BlackBerryPlatformScreen.h API has been updated.  Reflect those
+        changes in our usage.
+
+        Reviewed by Antonio Gomes.
+        Internally reviewed by Jakob Petsovits
+
+        * platform/blackberry/PlatformScreenBlackBerry.cpp:
+        (WebCore::screenAvailableRect):
+        (WebCore::screenRect):
+
 2012-03-02  Julien Chaffraix  <jchaffraix@webkit.org>
 

trunk/Source/WebCore/platform/blackberry/PlatformScreenBlackBerry.cpp

@@ -44 +44 @@
 FloatRect screenAvailableRect(Widget* widget)
 {
-    return FloatRect(FloatPoint(), FloatSize(IntSize(BlackBerry::Platform::Graphics::Screen::size())));
+    return FloatRect(FloatPoint(), FloatSize(IntSize(BlackBerry::Platform::Graphics::Screen::primaryScreen()->size())));
 }
 
 FloatRect screenRect(Widget* widget)
 {
-    return FloatRect(FloatPoint(), FloatSize(IntSize(BlackBerry::Platform::Graphics::Screen::size())));
+    return FloatRect(FloatPoint(), FloatSize(IntSize(BlackBerry::Platform::Graphics::Screen::primaryScreen()->size())));
 }
 

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

@@ -2070 +2070 @@
 int BackingStorePrivate::tileWidth()
 {
-    static int tileWidth = BlackBerry::Platform::Graphics::Screen::landscapeWidth();
+    static int tileWidth = BlackBerry::Platform::Graphics::Screen::primaryScreen()->landscapeWidth();
     return tileWidth;
 }
@@ -2076 +2076 @@
 int BackingStorePrivate::tileHeight()
 {
-    static int tileHeight = BlackBerry::Platform::Graphics::Screen::landscapeHeight();
+    static int tileHeight = BlackBerry::Platform::Graphics::Screen::primaryScreen()->landscapeHeight();
     return tileHeight;
 }

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

@@ -475 +475 @@
 
     m_page->settings()->setSpatialNavigationEnabled(m_webSettings->isSpatialNavigationEnabled());
-    blockClickRadius = int(roundf(0.35 * Platform::Graphics::Screen::pixelsPerInch(0).width())); // The clicked rectangle area should be a fixed unit of measurement.
+    blockClickRadius = int(roundf(0.35 * Platform::Graphics::Screen::primaryScreen()->pixelsPerInch(0).width())); // The clicked rectangle area should be a fixed unit of measurement.
 
     m_page->settings()->setDelegateSelectionPaint(true);
@@ -1619 +1619 @@
 IntSize WebPagePrivate::transformedViewportSize() const
 {
-    return Platform::Graphics::Screen::size();
+    return Platform::Graphics::Screen::primaryScreen()->size();
 }
 
@@ -2155 +2155 @@
 #if ENABLE(ORIENTATION_EVENTS)
             minWidth = m_mainFrame->orientation() % 180
-                ? Platform::Graphics::Screen::height()
-                : Platform::Graphics::Screen::width();
+                ? Platform::Graphics::Screen::primaryScreen()->height()
+                : Platform::Graphics::Screen::primaryScreen()->width();
 #else
-            minWidth = Platform::Graphics::Screen::width();
+            minWidth = Platform::Graphics::Screen::primaryScreen()->width();
 #endif
         }
@@ -3010 +3010 @@
 
     int desktopWidth = defaultMaxLayoutSize().width();
-    int deviceWidth = Platform::Graphics::Screen::width();
-    int deviceHeight = Platform::Graphics::Screen::height();
-    FloatSize currentPPI = Platform::Graphics::Screen::pixelsPerInch(-1);
+    int deviceWidth = Platform::Graphics::Screen::primaryScreen()->width();
+    int deviceHeight = Platform::Graphics::Screen::primaryScreen()->height();
+    FloatSize currentPPI = Platform::Graphics::Screen::primaryScreen()->pixelsPerInch(-1);
     int deviceDPI = int(roundf((currentPPI.width() + currentPPI.height()) / 2));
     if (m_viewportArguments.targetDensityDpi == ViewportArguments::ValueAuto) {
@@ -3379 +3379 @@
         return;
 
-    IntSize screenSize = Platform::Graphics::Screen::size();
+    IntSize screenSize = Platform::Graphics::Screen::primaryScreen()->size();
     ASSERT(size.width() <= screenSize.width() && size.height() <= screenSize.height());
     m_defaultLayoutSize = size.expandedTo(minimumLayoutSize).shrunkTo(screenSize);
@@ -5539 +5539 @@
     static IntSize size;
     if (size.isEmpty())
-        size = IntSize(std::max(1024, Platform::Graphics::Screen::landscapeWidth()),
-                       std::max(768, Platform::Graphics::Screen::landscapeHeight()));
+        size = IntSize(std::max(1024, Platform::Graphics::Screen::primaryScreen()->landscapeWidth()),
+                       std::max(768, Platform::Graphics::Screen::primaryScreen()->landscapeHeight()));
 
     return size;

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-03-02  Adam Treat  <atreat@rim.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=80161
+        PR: 141157
+
+        BlackBerryPlatformScreen.h API has been updated.  Reflect those
+        changes in our usage.
+
+        Reviewed by Antonio Gomes.
+        Internally reviewed by Jakob Petsovits.
+
+        * Api/BackingStore.cpp:
+        (BlackBerry::WebKit::BackingStorePrivate::tileWidth):
+        (BlackBerry::WebKit::BackingStorePrivate::tileHeight):
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::init):
+        (BlackBerry::WebKit::WebPagePrivate::transformedViewportSize):
+        (BlackBerry::WebKit::WebPagePrivate::fixedLayoutSize):
+        (BlackBerry::WebKit::WebPagePrivate::recomputeVirtualViewportFromViewportArguments):
+        (BlackBerry::WebKit::WebPagePrivate::setDefaultLayoutSize):
+        (BlackBerry::WebKit::WebPagePrivate::defaultMaxLayoutSize):
+        * WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
+        (WebCore::FrameLoaderClientBlackBerry::restoreViewState):
+        * WebKitSupport/SurfacePool.cpp:
+        (BlackBerry::WebKit::createCompositingSurface):
+
 2012-03-02  Konrad Piascik  <kpiascik@rim.com>
 

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

@@ -1059 +1059 @@
     // When rotate happens, only zoom when previous page was zoomToFitScale, otherwise keep old scale.
     if (orientationChanged && viewState.isZoomToFitScale)
-        scale = BlackBerry::Platform::Graphics::Screen::width() * scale / static_cast<double>(BlackBerry::Platform::Graphics::Screen::height());
+        scale = BlackBerry::Platform::Graphics::Screen::primaryScreen()->width() * scale / static_cast<double>(BlackBerry::Platform::Graphics::Screen::primaryScreen()->height());
     m_webPagePrivate->m_backingStore->d->suspendScreenAndBackingStoreUpdates(); // don't flash checkerboard for the setScrollPosition call
     m_frame->view()->setContentsSizeFromHistory(contentsSize);

trunk/Source/WebKit/blackberry/WebKitSupport/SurfacePool.cpp

@@ -39 +39 @@
 static PassRefPtr<BackingStoreCompositingSurface> createCompositingSurface()
 {
-    BlackBerry::Platform::IntSize screenSize = BlackBerry::Platform::Graphics::Screen::size();
+    BlackBerry::Platform::IntSize screenSize = BlackBerry::Platform::Graphics::Screen::primaryScreen()->size();
     return BackingStoreCompositingSurface::create(screenSize, false /*doubleBuffered*/);
 }