Changeset 139110 in webkit

Timestamp:

Jan 8, 2013 2:03:24 PM (11 years ago)

Author:

zhajiang@rim.com

Message:

[Blackberry][FullScreen] Create a helper method to adjust the fullscreen renderer dimensions
​https://bugs.webkit.org/show_bug.cgi?id=91748

Patch by Jacky Jiang <​zhajiang@rim.com>.
Reviewed by Antonio Gomes.

PR: 195524
The was originally from Antonio Gomes on PR195524. Bug 105488 has
partially upstreamed that patch. This patch upstreams the rest of it.

• Api/WebPage.cpp:

(BlackBerry::WebKit::WebPagePrivate::updateViewportSize):
(BlackBerry::WebKit::WebPagePrivate::notifyTransformedScrollChanged):

• Api/WebPage_p.h:

(WebPagePrivate):

• WebCoreSupport/ChromeClientBlackBerry.cpp:

(WebCore::ChromeClientBlackBerry::fullScreenRendererChanged):

Location:

trunk/Source/WebKit/blackberry

Files:

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

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

@@ -1480 +1480 @@
 
 #if ENABLE(FULLSCREEN_API)
-        // If we are in fullscreen video mode, and we change the FrameView::viewportRect,
-        // we need to adjust the media container to the new size.
-        if (m_fullscreenVideoNode) {
-            Document* document = m_fullscreenVideoNode->document();
-            ASSERT(document);
-            ASSERT(document->fullScreenRenderer());
-
-            int width = m_mainFrame->view()->visibleContentRect().size().width();
-            document->fullScreenRenderer()->style()->setWidth(Length(width, Fixed));
-        }
+        adjustFullScreenElementDimensionsIfNeeded();
 #endif
     }
@@ -1991 +1982 @@
     m_backingStore->d->scrollChanged(pos);
     m_client->scrollChanged();
+
+#if ENABLE(FULLSCREEN_API)
+    adjustFullScreenElementDimensionsIfNeeded();
+#endif
 }
 

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

@@ -220 +220 @@
     void enterFullScreenForElement(WebCore::Element*);
     void exitFullScreenForElement(WebCore::Element*);
+    void adjustFullScreenElementDimensionsIfNeeded();
 #endif
     void contentsSizeChanged(const WebCore::IntSize&);

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-01-08  Jacky Jiang  <zhajiang@rim.com>
+
+        [Blackberry][FullScreen] Create a helper method to adjust the fullscreen renderer dimensions
+        https://bugs.webkit.org/show_bug.cgi?id=91748
+
+        Reviewed by Antonio Gomes.
+
+        PR: 195524
+        The was originally from Antonio Gomes on PR195524. Bug 105488 has
+        partially upstreamed that patch. This patch upstreams the rest of it.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::updateViewportSize):
+        (BlackBerry::WebKit::WebPagePrivate::notifyTransformedScrollChanged):
+        * Api/WebPage_p.h:
+        (WebPagePrivate):
+        * WebCoreSupport/ChromeClientBlackBerry.cpp:
+        (WebCore::ChromeClientBlackBerry::fullScreenRendererChanged):
+
 2013-01-08  Mark Lam  <mark.lam@apple.com>
 

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

@@ -766 +766 @@
 }
 
-void ChromeClientBlackBerry::fullScreenRendererChanged(RenderBox* fullScreenRenderer)
-{
-    // Once we go fullscreen using the new FULLSCREEN_API code path, we have to take into account
-    // our port specific page scaling.
-    if (fullScreenRenderer) {
-        int width = m_webPagePrivate->m_mainFrame->view()->visibleContentRect().size().width();
-        fullScreenRenderer->style()->setWidth(Length(width, Fixed));
-    }
+void ChromeClientBlackBerry::fullScreenRendererChanged(RenderBox*)
+{
+    m_webPagePrivate->adjustFullScreenElementDimensionsIfNeeded();
 }
 #endif