Changeset 139955 in webkit

Timestamp:

Jan 16, 2013 7:52:52 PM (11 years ago)

Author:

charles.wei@torchmobile.com.cn

Message:

[BlackBerry] Need to adjust the scale and scroll position after leaving fullscreen mode if there's
device rotation in fullscreen mode
​https://bugs.webkit.org/show_bug.cgi?id=107085

Reviewed by George STaikos.
Also internally reviewed by Jacky Jiang.

We saved the scale and scroll position before entering full screen mode, so that we can restore
them after leaving fullscreen mode, because entering fullscreen mode automatically changes the

scale to make the video to fit to the viewport. But if there's device rotation during the fullscreen,
the scale and scroll position saved before may or may not apply anymore, we need to adjust the
scale and/or scroll position if needed to make sure no over-scale or over-scroll in the new orientation.

• Api/WebPage.cpp:

(BlackBerry::WebKit::WebPagePrivate::setViewportSize):
(BlackBerry::WebKit::WebPagePrivate::enterFullScreenForElement):

• Api/WebPage_p.h:

(WebPagePrivate):

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/WebPage.cpp (modified) (2 diffs)
• Api/WebPage_p.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)

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

@@ -3820 +3820 @@
 
 #if ENABLE(FULLSCREEN_API) && ENABLE(VIDEO)
-    // When leaving fullscreen mode, restore the scale and scroll position
-    // if needed.
-    // FIXME: The cached values might get imprecise if user have rotated the
-    // device while in fullscreen.
+    // When leaving fullscreen mode, restore the scale and scroll position if needed.
+    // We also need to make sure the scale and scroll position won't cause over scale or over scroll.
     if (m_scaleBeforeFullScreen > 0 && !m_fullscreenVideoNode) {
         // Restore the scale when leaving fullscreen. We can't use TransformationMatrix::scale(double) here,
         // as it will multiply the scale rather than set the scale.
         // FIXME: We can refactor this into setCurrentScale(double) if it is useful in the future.
+        if (m_orientationBeforeFullScreen % 180 != orientation() % 180) { // Orientation changed
+            if (m_actualVisibleWidth > contentsSize().width() * m_scaleBeforeFullScreen) {
+                // Cached scale need to be adjusted after rotation.
+                m_scaleBeforeFullScreen = double(m_actualVisibleWidth) / contentsSize().width();
+            }
+            if (m_scaleBeforeFullScreen * contentsSize().height() < m_actualVisibleHeight) {
+                // Use zoom to fit height scale in order to cover the screen height.
+                m_scaleBeforeFullScreen = double(m_actualVisibleHeight) / contentsSize().height();
+            }
+
+            if (m_actualVisibleWidth > m_scaleBeforeFullScreen * (contentsSize().width() - m_scrollPositionBeforeFullScreen.x())) {
+                // Cached scroll position over scrolls horizontally after rotation.
+                m_scrollPositionBeforeFullScreen.setX(contentsSize().width() - m_actualVisibleWidth / m_scaleBeforeFullScreen);
+            }
+            if (m_actualVisibleHeight > m_scaleBeforeFullScreen * (contentsSize().height() - m_scrollPositionBeforeFullScreen.y())) {
+                // Cached scroll position over scrolls vertically after rotation.
+                m_scrollPositionBeforeFullScreen.setY(contentsSize().height() - m_actualVisibleHeight / m_scaleBeforeFullScreen);
+            }
+        }
+
         m_transformationMatrix->setM11(m_scaleBeforeFullScreen);
         m_transformationMatrix->setM22(m_scaleBeforeFullScreen);
@@ -5809 +5827 @@
             // once element leaves fullscreen.
             m_scrollPositionBeforeFullScreen = m_mainFrame->view()->scrollPosition();
+
+            // We need to remember the orientation before entering fullscreen, so that we can adjust
+            // the scale and scroll position when exiting fullscreen if needed, because the scale and
+            // scroll position  may not apply (overscale and/or overscroll) in the other orientation.
+            m_orientationBeforeFullScreen = orientation();
         }
 

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

@@ -529 +529 @@
     double m_scaleBeforeFullScreen;
     WebCore::IntPoint m_scrollPositionBeforeFullScreen;
+    int m_orientationBeforeFullScreen;
 #endif
 #endif

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-01-16  Charles Wei  <charles.wei@torchmobile.com.cn>
+
+        [BlackBerry] Need to adjust the scale and scroll position after leaving fullscreen mode if there's
+        device rotation in fullscreen mode
+        https://bugs.webkit.org/show_bug.cgi?id=107085
+
+        Reviewed by George STaikos.
+        Also internally reviewed by Jacky Jiang.
+
+        We saved the scale and scroll position before entering full screen mode, so that we can restore
+        them after leaving fullscreen mode, because entering fullscreen mode automatically changes the 
+       scale to make the video to fit to the viewport. But if there's device rotation during the fullscreen,
+       the scale and scroll position saved before may or may not apply anymore, we need to adjust the
+       scale and/or scroll position if needed to make sure no over-scale or over-scroll in the new orientation.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::setViewportSize):
+        (BlackBerry::WebKit::WebPagePrivate::enterFullScreenForElement):
+        * Api/WebPage_p.h:
+        (WebPagePrivate):
+
 2013-01-16  Joe Mason  <jmason@rim.com>