Changeset 134240 in webkit

Timestamp:

Nov 12, 2012 7:43:51 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Update BB10 form theme.
​https://bugs.webkit.org/show_bug.cgi?id=100760

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

RIM PR 236993
Internally Reviewed by Jeff Rogers.
Use slide and paint method on slider range and media controls.

• platform/blackberry/RenderThemeBlackBerry.cpp:

(WebCore):
(WebCore::drawThreeSliceHorizontal):
(WebCore::drawThreeSliceVertical):
(WebCore::RenderThemeBlackBerry::paintSliderTrackRect):
(WebCore::RenderThemeBlackBerry::paintMediaSliderTrack):
(WebCore::RenderThemeBlackBerry::paintMediaSliderThumb):
(WebCore::RenderThemeBlackBerry::paintMediaVolumeSliderTrack):

• platform/blackberry/RenderThemeBlackBerry.h:

(RenderThemeBlackBerry):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-12  Tiancheng Jiang  <tijiang@rim.com>
+
+        [BlackBerry] Update BB10 form theme.
+        https://bugs.webkit.org/show_bug.cgi?id=100760
+
+        Reviewed by Rob Buis.
+
+        RIM PR 236993
+        Internally Reviewed by Jeff Rogers.
+        Use slide and paint method on slider range and media controls.
+
+        * platform/blackberry/RenderThemeBlackBerry.cpp:
+        (WebCore):
+        (WebCore::drawThreeSliceHorizontal):
+        (WebCore::drawThreeSliceVertical):
+        (WebCore::RenderThemeBlackBerry::paintSliderTrackRect):
+        (WebCore::RenderThemeBlackBerry::paintMediaSliderTrack):
+        (WebCore::RenderThemeBlackBerry::paintMediaSliderThumb):
+        (WebCore::RenderThemeBlackBerry::paintMediaVolumeSliderTrack):
+        * platform/blackberry/RenderThemeBlackBerry.h:
+        (RenderThemeBlackBerry):
+
 2012-11-12  Kent Tamura  <tkent@chromium.org>
 

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

@@ -122 +122 @@
 const RGBA32 dragRollDark = 0xff69a8ff;
 
-const RGBA32 selection = 0xff2b8fff;
-
 const RGBA32 blackPen = Color::black;
 const RGBA32 focusRingPen = 0xffa3c8fe;
@@ -183 +181 @@
 }
 
-static void drawThreeSlice(GraphicsContext* gc, const IntRect& rect, Image* img, int slice)
+static void drawThreeSliceHorizontal(GraphicsContext* gc, const IntRect& rect, Image* img, int slice)
 {
     if (!img)
         return;
+
     FloatSize dstSlice(rect.height() / 2, rect.height());
     FloatRect srcRect(0, 0, slice, img->height());
@@ -198 +197 @@
     srcRect = FloatRect(slice, 0, img->width() - 2 * slice, img->height());
     dstRect = FloatRect(rect.x() + dstSlice.width(), rect.y(), rect.width() - 2 * dstSlice.width(), dstSlice.height());
+    gc->drawImage(img, ColorSpaceDeviceRGB, dstRect, srcRect);
+}
+
+static void drawThreeSliceVertical(GraphicsContext* gc, const IntRect& rect, Image* img, int slice)
+{
+    if (!img)
+        return;
+
+    FloatSize dstSlice(rect.width(), rect.width() / 2);
+    FloatRect srcRect(0, 0, img->width(), slice);
+    FloatRect dstRect(rect.location(), dstSlice);
+
+    gc->drawImage(img, ColorSpaceDeviceRGB, dstRect, srcRect);
+    srcRect.move(0, img->height() - srcRect.height());
+    dstRect.move(0, rect.height() - dstRect.height());
+    gc->drawImage(img, ColorSpaceDeviceRGB, dstRect, srcRect);
+
+    srcRect = FloatRect(0, slice, img->width(), img->height() - 2 * slice);
+    dstRect = FloatRect(rect.x(), rect.y() + dstSlice.height(), dstSlice.width(), rect.height() - 2 * dstSlice.height());
     gc->drawImage(img, ColorSpaceDeviceRGB, dstRect, srcRect);
 }
@@ -723 +741 @@
 bool RenderThemeBlackBerry::paintSliderTrackRect(RenderObject* object, const PaintInfo& info, const IntRect& rect)
 {
-    return paintSliderTrackRect(object, info, rect, rangeSliderRegularTopOutline, rangeSliderRegularBottomOutline,
-                rangeSliderRegularTop, rangeSliderRegularBottom);
-}
-
-bool RenderThemeBlackBerry::paintSliderTrackRect(RenderObject* object, const PaintInfo& info, const IntRect& rect,
-        RGBA32 strokeColorStart, RGBA32 strokeColorEnd, RGBA32 fillColorStart, RGBA32 fillColorEnd)
+    static RefPtr<Image> background;
+    if (!background)
+        background = loadImage("core_slider_bg");
+    return paintSliderTrackRect(object, info, rect, background.get());
+}
+
+bool RenderThemeBlackBerry::paintSliderTrackRect(RenderObject* object, const PaintInfo& info, const IntRect& rect, Image* inactive)
 {
     ASSERT(info.context);
@@ -734 +753 @@
     GraphicsContext* context = info.context;
 
-    static RefPtr<Image> disabled, inactive;
-    if (!disabled) {
+    static RefPtr<Image> disabled;
+    if (!disabled)
         disabled = loadImage("core_slider_fill_disabled");
-        inactive = loadImage("core_slider_bg");
-    }
-
-    if (isEnabled(object))
-        drawThreeSlice(context, rect, inactive.get(), mediumSlice);
-    else
-        drawThreeSlice(context, rect, disabled.get(), (smallSlice - 1));
+
+    if (rect.width() > rect.height()) {
+        if (isEnabled(object))
+            drawThreeSliceHorizontal(context, rect, inactive, mediumSlice);
+        else
+            drawThreeSliceHorizontal(context, rect, disabled.get(), (smallSlice - 1));
+    } else {
+        if (isEnabled(object))
+            drawThreeSliceVertical(context, rect, inactive, mediumSlice);
+        else
+            drawThreeSliceVertical(context, rect, disabled.get(), (smallSlice - 1));
+    }
 
     context->restore();
@@ -971 +995 @@
 
     // This is to paint main slider bar.
-    bool result = paintSliderTrackRect(object, paintInfo, rect2);
+    static RefPtr<Image> trackImage;
+    if (!trackImage)
+        trackImage = loadImage("core_slider_media_bg");
+    bool result = paintSliderTrackRect(object, paintInfo, rect2, trackImage.get());
 
     if (loaded > 0 || position > 0) {
         // This is to paint buffered bar.
-        paintSliderTrackRect(object, paintInfo, buffered, Color::darkGray, Color::darkGray, Color::darkGray, Color::darkGray);
+        static RefPtr<Image> bufferedImage, playedImage;
+        if (!bufferedImage) {
+            bufferedImage = loadImage("core_slider_buffered_bg");
+            playedImage = loadImage("core_slider_played_bg");
+        }
+        paintSliderTrackRect(object, paintInfo, buffered, bufferedImage.get());
 
         // This is to paint played part of bar (left of slider thumb) using selection color.
-        paintSliderTrackRect(object, paintInfo, played, selection, selection, selection, selection);
+        paintSliderTrackRect(object, paintInfo, played, playedImage.get());
     }
     return result;
@@ -997 +1029 @@
         return false;
 
-    float fullScreenMultiplier = determineFullScreenMultiplier(toElement(slider->node()));
-
-    paintInfo.context->save();
-    Path mediaThumbRoundedRectangle;
-    mediaThumbRoundedRectangle.addRoundedRect(rect, FloatSize(mediaSliderThumbRadius * fullScreenMultiplier, mediaSliderThumbRadius * fullScreenMultiplier));
-    paintInfo.context->setStrokeStyle(SolidStroke);
-    paintInfo.context->setStrokeThickness(0.5);
-    paintInfo.context->setStrokeColor(Color::black, ColorSpaceDeviceRGB);
-
-    if (isPressed(object) || isHovered(object) || slider->inDragMode()) {
-        paintInfo.context->setFillGradient(createLinearGradient(selection, Color(selection).dark().rgb(),
-                rect.maxXMinYCorner(), rect.maxXMaxYCorner()));
-    } else {
-        paintInfo.context->setFillGradient(createLinearGradient(Color::white, Color(Color::white).dark().rgb(),
-                rect.maxXMinYCorner(), rect.maxXMaxYCorner()));
-    }
-    paintInfo.context->fillPath(mediaThumbRoundedRectangle);
-    paintInfo.context->restore();
+    static Image* mediaVolumeThumb = Image::loadPlatformResource("volume_thumb").leakRef();
+
+    drawControl(paintInfo.context, rect, mediaVolumeThumb);
 
     return true;
@@ -1036 +1053 @@
     IntRect rect2(x, y, width, height);
 
-    return paintSliderTrackRect(object, paintInfo, rect2);
+    static RefPtr<Image> trackImage;
+    if (!trackImage)
+        trackImage = loadImage("core_slider_media_bg");
+
+    return paintSliderTrackRect(object, paintInfo, rect2, trackImage.get());
 #else
     UNUSED_PARAM(object);

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

@@ -108 +108 @@
     bool paintTextFieldOrTextAreaOrSearchField(RenderObject*, const PaintInfo&, const IntRect&);
     bool paintSliderTrackRect(RenderObject*, const PaintInfo&, const IntRect&);
-    bool paintSliderTrackRect(RenderObject*, const PaintInfo&, const IntRect&, RGBA32 strokeColorStart,
-                RGBA32 strokeColorEnd, RGBA32 fillColorStart, RGBA32 fillColorEnd);
+
+    bool paintSliderTrackRect(RenderObject*, const PaintInfo&, const IntRect&, Image*);
+    IntRect convertToPaintingRect(RenderObject* inputRenderer, const RenderObject* partRenderer, LayoutRect partRect, const IntRect& localOffset) const;
 
 };