Title: [138261] trunk/Source/WebCore
- Revision
- 138261
- Author
- commit-qu...@webkit.org
- Date
- 2012-12-20 09:33:29 -0800 (Thu, 20 Dec 2012)
Log Message
[BlackBerry]Change fullscreen back button size
https://bugs.webkit.org/show_bug.cgi?id=105541
Patch by Tiancheng Jiang <tiji...@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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (138260 => 138261)
--- trunk/Source/WebCore/ChangeLog 2012-12-20 17:29:34 UTC (rev 138260)
+++ trunk/Source/WebCore/ChangeLog 2012-12-20 17:33:29 UTC (rev 138261)
@@ -1,3 +1,17 @@
+2012-12-20 Tiancheng Jiang <tiji...@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 <dmazz...@google.com>
AX: support clickPoint in DRT for chromium
Modified: trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp (138260 => 138261)
--- trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp 2012-12-20 17:29:34 UTC (rev 138260)
+++ trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp 2012-12-20 17:33:29 UTC (rev 138261)
@@ -47,6 +47,9 @@
const float marginSize = 4;
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;
const float mediaSliderThumbWidth = 25;
@@ -1002,11 +1005,16 @@
static Image* mediaExitFullscreen = Image::loadPlatformResource("back").leakRef();
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;
+ 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, rect, buttonImage);
+ return paintMediaButton(paintInfo.context, currentRect, buttonImage);
#else
UNUSED_PARAM(object);
UNUSED_PARAM(paintInfo);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
