Changeset 138261 in webkit

Timestamp:

Dec 20, 2012, 9:33:29 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry]Change fullscreen back button size
​https://bugs.webkit.org/show_bug.cgi?id=105541

Patch by Tiancheng Jiang <​tijiang@rim.com> on 2012-12-20
Reviewed by Rob Buis.

Internally Reviewed by John Griggs.
Resize fullscreen mode back button size to meet browser back button size.

• platform/blackberry/RenderThemeBlackBerry.cpp:

(WebCore):
(WebCore::RenderThemeBlackBerry::paintMediaFullscreenButton):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/blackberry/RenderThemeBlackBerry.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-12-20  Tiancheng Jiang  <tijiang@rim.com>
+
+        [BlackBerry]Change fullscreen back button size
+        https://bugs.webkit.org/show_bug.cgi?id=105541
+
+        Reviewed by Rob Buis.
+
+        Internally Reviewed by John Griggs.
+        Resize fullscreen mode back button size to meet browser back button size.
+
+        * platform/blackberry/RenderThemeBlackBerry.cpp:
+        (WebCore):
+        (WebCore::RenderThemeBlackBerry::paintMediaFullscreenButton):
+
 2012-12-20  Dominic Mazzoni  <dmazzoni@google.com>
 

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

@@ -48 +48 @@
 const float mediaControlsHeight = 44;
 const float mediaBackButtonHeight = 33;
+// Scale exit-fullscreen button size.
+const float mediaFullscreenButtonHeightRatio = 5 / 11.0;
+const float mediaFullscreenButtonWidthRatio = 3 / 11.0;
 const float mediaSliderOutlineWidth = 2;
 const float mediaSliderTrackRadius = 3;
@@ -1003 +1006 @@
 
     Image* buttonImage = mediaEnterFullscreen;
+    IntRect currentRect(rect);
 #if ENABLE(FULLSCREEN_API)
-    if (mediaElement->document()->webkitIsFullScreen() && mediaElement->document()->webkitCurrentFullScreenElement() == mediaElement)
+    if (mediaElement->document()->webkitIsFullScreen() && mediaElement->document()->webkitCurrentFullScreenElement() == mediaElement) {
         buttonImage = mediaExitFullscreen;
-#endif
-    return paintMediaButton(paintInfo.context, rect, buttonImage);
+        IntRect fullscreenRect(rect.x() + (1 - mediaFullscreenButtonWidthRatio) * rect.width() / 2, rect.y() + (1 - mediaFullscreenButtonHeightRatio) * rect.height() / 2,
+            rect.width() * mediaFullscreenButtonWidthRatio, rect.height() * mediaFullscreenButtonHeightRatio);
+        currentRect = fullscreenRect;
+    }
+#endif
+    return paintMediaButton(paintInfo.context, currentRect, buttonImage);
 #else
     UNUSED_PARAM(object);