Changeset 49740 in webkit

Timestamp:

Oct 17, 2009 8:45:32 AM (15 years ago)

Author:

eric@webkit.org

Message:

2009-10-17 Alpha Lam <​hclam@chromium.org>

Reviewed by Eric Seidel.

[chromium] Video controls not zoomed / transformed correctly
​https://bugs.webkit.org/show_bug.cgi?id=30461

Draw the images in the controls scaled.

No new tests. With this change Chromium will pass the following tests:
LayoutTests/media/video-controls-zoomed.html
LayoutTests/media/video-controls-transformed.html

• rendering/RenderMediaControlsChromium.cpp: (WebCore::paintMediaButton): Pass along the target rect directly. (WebCore::RenderMediaControlsChromium::adjustMediaSliderThumbSize): Adjust the thumb slide applied with the scale factor.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderMediaControlsChromium.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-10-17  Alpha Lam  <hclam@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        [chromium] Video controls not zoomed / transformed correctly
+        https://bugs.webkit.org/show_bug.cgi?id=30461
+
+        Draw the images in the controls scaled.
+
+        No new tests. With this change Chromium will pass the following tests:
+        LayoutTests/media/video-controls-zoomed.html
+        LayoutTests/media/video-controls-transformed.html
+
+        * rendering/RenderMediaControlsChromium.cpp:
+        (WebCore::paintMediaButton):
+        Pass along the target rect directly.
+        (WebCore::RenderMediaControlsChromium::adjustMediaSliderThumbSize):
+        Adjust the thumb slide applied with the scale factor.
+
 2009-10-17  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
 

trunk/WebCore/rendering/RenderMediaControlsChromium.cpp

@@ -57 +57 @@
 static bool paintMediaButton(GraphicsContext* context, const IntRect& rect, Image* image)
 {
-    // Create a destination rectangle for the image that is centered in the drawing rectangle, rounded left, and down.
     IntRect imageRect = image->rect();
-    imageRect.setY(rect.y() + (rect.height() - image->height() + 1) / 2);
-    imageRect.setX(rect.x() + (rect.width() - image->width() + 1) / 2);
-
-    context->drawImage(image, imageRect);
+    context->drawImage(image, rect);
     return true;
 }
@@ -279 +275 @@
         thumbImage = mediaVolumeSliderThumb;
 
+    float zoomLevel = object->style()->effectiveZoom();
     if (thumbImage) {
-        object->style()->setWidth(Length(thumbImage->width(), Fixed));
-        object->style()->setHeight(Length(thumbImage->height(), Fixed));
+        object->style()->setWidth(Length(static_cast<int>(thumbImage->width() * zoomLevel), Fixed));
+        object->style()->setHeight(Length(static_cast<int>(thumbImage->height() * zoomLevel), Fixed));
     }
 }