Title: [151601] trunk/Source/WebCore
Revision
151601
Author
[email protected]
Date
2013-06-14 12:34:07 -0700 (Fri, 14 Jun 2013)

Log Message

[Windows] Provide simple <meter> drawing logic for testing.
https://bugs.webkit.org/show_bug.cgi?id=117645.

Reviewed by Anders Carlsson.

accessbility/meter-element.html

* rendering/RenderThemeSafari.cpp: Simple test implementation
(WebCore::RenderThemeSafari::adjustMeterStyle): Added.
(WebCore::RenderThemeSafari::supportsMeter): Added.
(WebCore::RenderThemeSafari::meterSizeForBounds): Added.
(WebCore::RenderThemeSafari::paintMeter): Added.
* rendering/RenderThemeSafari.h:
* rendering/RenderThemeWin.cpp:
(WebCore::RenderThemeWin::progressBarTheme): Added.
(WebCore::RenderThemeWin::getClassicThemeData): Support meters.
(WebCore::RenderThemeWin::getThemeData): Support meter theme.
(WebCore::RenderThemeWin::adjustMeterStyle): Added.
(WebCore::RenderThemeWin::supportsMeter): Added.
(WebCore::RenderThemeWin::meterSizeForBounds): Added.
(WebCore::RenderThemeWin::paintMeter): Added.
* rendering/RenderThemeWin.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (151600 => 151601)


--- trunk/Source/WebCore/ChangeLog	2013-06-14 17:18:59 UTC (rev 151600)
+++ trunk/Source/WebCore/ChangeLog	2013-06-14 19:34:07 UTC (rev 151601)
@@ -1,3 +1,28 @@
+2013-06-14  Brent Fulgham  <[email protected]>
+
+        [Windows] Provide simple <meter> drawing logic for testing.
+        https://bugs.webkit.org/show_bug.cgi?id=117645.
+
+        Reviewed by Anders Carlsson.
+
+        accessbility/meter-element.html
+
+        * rendering/RenderThemeSafari.cpp: Simple test implementation
+        (WebCore::RenderThemeSafari::adjustMeterStyle): Added.
+        (WebCore::RenderThemeSafari::supportsMeter): Added.
+        (WebCore::RenderThemeSafari::meterSizeForBounds): Added.
+        (WebCore::RenderThemeSafari::paintMeter): Added.
+        * rendering/RenderThemeSafari.h:
+        * rendering/RenderThemeWin.cpp:
+        (WebCore::RenderThemeWin::progressBarTheme): Added.
+        (WebCore::RenderThemeWin::getClassicThemeData): Support meters.
+        (WebCore::RenderThemeWin::getThemeData): Support meter theme.
+        (WebCore::RenderThemeWin::adjustMeterStyle): Added.
+        (WebCore::RenderThemeWin::supportsMeter): Added.
+        (WebCore::RenderThemeWin::meterSizeForBounds): Added.
+        (WebCore::RenderThemeWin::paintMeter): Added.
+        * rendering/RenderThemeWin.h:
+
 2013-06-14  Eric Carlson  <[email protected]>
 
         Potential use-after-free with an event fired at a HTMLMediaElement which is currently being deleted

Modified: trunk/Source/WebCore/rendering/RenderThemeSafari.cpp (151600 => 151601)


--- trunk/Source/WebCore/rendering/RenderThemeSafari.cpp	2013-06-14 17:18:59 UTC (rev 151600)
+++ trunk/Source/WebCore/rendering/RenderThemeSafari.cpp	2013-06-14 19:34:07 UTC (rev 151601)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007, 2008, 2009 Apple Inc.
+ * Copyright (C) 2007, 2008, 2009, 2013 Apple Inc.
  * Copyright (C) 2009 Kenneth Rohde Christiansen
  *
  * This library is free software; you can redistribute it and/or
@@ -35,9 +35,11 @@
 #include "GraphicsContextCG.h"
 #include "HTMLInputElement.h"
 #include "HTMLMediaElement.h"
+#include "HTMLMeterElement.h"
 #include "HTMLNames.h"
 #include "PaintInfo.h"
 #include "RenderMediaControls.h"
+#include "RenderMeter.h"
 #include "RenderSlider.h"
 #include "RenderView.h"
 #include "SoftLinking.h"
@@ -1202,6 +1204,52 @@
 }
 #endif
 
+#if ENABLE(METER_ELEMENT)
+void RenderThemeSafari::adjustMeterStyle(StyleResolver*, RenderStyle* style, Element*) const
+{
+    style->setBoxShadow(nullptr);
+}
+
+bool RenderThemeSafari::supportsMeter(ControlPart part) const
+{
+    switch (part) {
+    case MeterPart:
+        return true;
+    default:
+        return false;
+    }
+}
+
+IntSize RenderThemeSafari::meterSizeForBounds(const RenderMeter*, const IntRect& bounds) const
+{
+    return bounds.size();
+}
+
+bool RenderThemeSafari::paintMeter(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
+{
+    // NOTE: This routine is for testing only. It should be fleshed out with a real CG-based implementation.
+    // Right now it uses a slider, with the thumb positioned at the meter point.
+    if (!renderObject->isMeter())
+        return true;
+
+    HTMLMeterElement* element = toRenderMeter(renderObject)->meterElement();
+
+    int remaining = static_cast<int>((1.0 - element->valueRatio()) * static_cast<double>(rect.size().width()));
+
+    // Draw the background
+    paintSliderTrack(renderObject, paintInfo, rect);
+
+    // Draw the progress portion
+    IntRect completedRect(rect);
+    completedRect.contract(remaining, 0);
+
+    paintSliderThumb(renderObject, paintInfo, completedRect);
+
+    return true;
+}
+
+#endif
+
 } // namespace WebCore
 
 #endif // #if USE(SAFARI_THEME)

Modified: trunk/Source/WebCore/rendering/RenderThemeSafari.h (151600 => 151601)


--- trunk/Source/WebCore/rendering/RenderThemeSafari.h	2013-06-14 17:18:59 UTC (rev 151600)
+++ trunk/Source/WebCore/rendering/RenderThemeSafari.h	2013-06-14 19:34:07 UTC (rev 151601)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007, 2008 Apple Inc.
+ * Copyright (C) 2007, 2008, 2013 Apple Inc.
  * Copyright (C) 2009 Kenneth Rohde Christiansen
  *
  * This library is free software; you can redistribute it and/or
@@ -138,6 +138,13 @@
     virtual bool paintMediaSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
 #endif
 
+#if ENABLE(METER_ELEMENT)
+    virtual IntSize meterSizeForBounds(const RenderMeter*, const IntRect&) const OVERRIDE;
+    virtual bool supportsMeter(ControlPart) const OVERRIDE;
+    virtual void adjustMeterStyle(StyleResolver*, RenderStyle*, Element*) const OVERRIDE;
+    virtual bool paintMeter(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
+#endif
+
     virtual bool shouldShowPlaceholderWhenFocused() const { return true; }
 
 private:

Modified: trunk/Source/WebCore/rendering/RenderThemeWin.cpp (151600 => 151601)


--- trunk/Source/WebCore/rendering/RenderThemeWin.cpp	2013-06-14 17:18:59 UTC (rev 151600)
+++ trunk/Source/WebCore/rendering/RenderThemeWin.cpp	2013-06-14 19:34:07 UTC (rev 151601)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.
+ * Copyright (C) 2006, 2007, 2013 Apple Inc.
  * Copyright (C) 2009 Kenneth Rohde Christiansen
  *
  * This library is free software; you can redistribute it and/or
@@ -109,7 +109,37 @@
 #define UPS_PRESSED     3
 #define UPS_DISABLED    4
 
+// Progress bar parts
+#define PP_BAR          1
+#define PP_BARVERT      2
+#define PP_CHUNK        3
+#define PP_CHUNKVERT    4
+#define PP_FILL         5
+#define PP_FILLVERT     6
+#define PP_PULSEOVERLAY 7
+#define PP_MOVEOVERLAY  8
+#define PP_PULSEOVERLAYVERT 9
+#define PP_MOVEOVERLAYVERT  10
+#define PP_TRANSPARENTBAR   11
+#define PP_TRANSPARENTBARVERT 12
 
+// Progress bar states
+#define PBBS_NORMAL     1
+#define PBBS_PARTIAL    2
+#define PBBVS_NORMAL    1 // Vertical
+#define PBBVS_PARTIAL   2
+
+// Progress bar fill states
+#define PBFS_NORMAL     1
+#define PBFS_ERROR      2
+#define PBFS_PAUSED     3
+#define PBFS_PARTIAL    4
+#define PBFVS_NORMAL    1 // Vertical
+#define PBFVS_ERROR     2
+#define PBFVS_PAUSED    3
+#define PBFVS_PARTIAL   4
+
+
 SOFT_LINK_LIBRARY(uxtheme)
 SOFT_LINK(uxtheme, OpenThemeData, HANDLE, WINAPI, (HWND hwnd, LPCWSTR pszClassList), (hwnd, pszClassList))
 SOFT_LINK(uxtheme, CloseThemeData, HRESULT, WINAPI, (HANDLE hTheme), (hTheme))
@@ -173,6 +203,7 @@
     , m_menuListTheme(0)
     , m_sliderTheme(0)
     , m_spinButtonTheme(0)
+    , m_progressBarTheme(0)
 {
     haveTheme = uxthemeLibrary() && IsThemeActive();
 }
@@ -220,6 +251,13 @@
     return m_spinButtonTheme;
 }
 
+HANDLE RenderThemeWin::progressBarTheme() const
+{
+    if (haveTheme && !m_progressBarTheme)
+        m_progressBarTheme = OpenThemeData(0, L"Progress");
+    return m_progressBarTheme;
+}
+
 void RenderThemeWin::close()
 {
     // This method will need to be called when the OS theme changes to flush our cached themes.
@@ -233,7 +271,9 @@
         CloseThemeData(m_sliderTheme);
     if (m_spinButtonTheme)
         CloseThemeData(m_spinButtonTheme);
-    m_buttonTheme = m_textFieldTheme = m_menuListTheme = m_sliderTheme = m_spinButtonTheme = 0;
+    if (m_progressBarTheme)
+        CloseThemeData(m_progressBarTheme);
+    m_buttonTheme = m_textFieldTheme = m_menuListTheme = m_sliderTheme = m_spinButtonTheme = m_progressBarTheme = 0;
 
     haveTheme = uxthemeLibrary() && IsThemeActive();
 }
@@ -523,6 +563,10 @@
             result.m_part = DFC_SCROLL;
             result.m_state = determineClassicState(o);
             break;
+        case MeterPart:
+            result.m_part = PP_BAR;
+            result.m_state = determineState(o);
+            break;
         case SearchFieldPart:
         case TextFieldPart:
         case TextAreaPart:
@@ -584,6 +628,10 @@
                 result.m_state = determineState(o);
             break;
         }
+        case MeterPart:
+            result.m_part = PP_BAR;
+            result.m_state = determineState(o);
+            break;
         case RadioPart:
             result.m_part = BP_RADIO;
             result.m_state = determineState(o);
@@ -1120,7 +1168,54 @@
     return RenderMediaControls::volumeSliderOffsetFromMuteButton(muteButtonBox, size);
 }
 
+#endif
 
+#if ENABLE(METER_ELEMENT)
+void RenderThemeWin::adjustMeterStyle(StyleResolver*, RenderStyle* style, Element*) const
+{
+    style->setBoxShadow(nullptr);
+}
+
+bool RenderThemeWin::supportsMeter(ControlPart part) const
+{
+    switch (part) {
+    case MeterPart:
+        return true;
+    default:
+        return false;
+    }
+}
+
+IntSize RenderThemeWin::meterSizeForBounds(const RenderMeter*, const IntRect& bounds) const
+{
+    return bounds.size();
+}
+
+bool RenderThemeWin::paintMeter(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
+{
+    if (!renderObject->isMeter())
+        return true;
+
+    HTMLMeterElement* element = toRenderMeter(renderObject)->meterElement();
+
+    ThemeData theme = getThemeData(renderObject);
+
+    int remaining = static_cast<int>((1.0 - element->valueRatio()) * static_cast<double>(rect.size().width()));
+
+    // Draw the background
+    drawControl(paintInfo.context, renderObject, progressBarTheme(), theme, rect);
+
+    // Draw the progress portion
+    IntRect completedRect(rect);
+    completedRect.contract(remaining, 0);
+
+    theme.m_part = PP_FILL;
+    drawControl(paintInfo.context, renderObject, progressBarTheme(), theme, completedRect);
+
+    return true;
+}
+
 #endif
 
+
 }

Modified: trunk/Source/WebCore/rendering/RenderThemeWin.h (151600 => 151601)


--- trunk/Source/WebCore/rendering/RenderThemeWin.h	2013-06-14 17:18:59 UTC (rev 151600)
+++ trunk/Source/WebCore/rendering/RenderThemeWin.h	2013-06-14 19:34:07 UTC (rev 151601)
@@ -1,7 +1,7 @@
 /*
  * This file is part of the WebKit project.
  *
- * Copyright (C) 2006, 2008 Apple Computer, Inc.
+ * Copyright (C) 2006, 2008, 2013 Apple Computer, Inc.
  * Copyright (C) 2009 Kenneth Rohde Christiansen
  *
  * This library is free software; you can redistribute it and/or
@@ -144,6 +144,13 @@
     virtual IntPoint volumeSliderOffsetFromMuteButton(RenderBox*, const IntSize&) const OVERRIDE;
 #endif
 
+#if ENABLE(METER_ELEMENT)
+    virtual IntSize meterSizeForBounds(const RenderMeter*, const IntRect&) const OVERRIDE;
+    virtual bool supportsMeter(ControlPart) const OVERRIDE;
+    virtual void adjustMeterStyle(StyleResolver*, RenderStyle*, Element*) const OVERRIDE;
+    virtual bool paintMeter(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
+#endif
+
     virtual bool shouldShowPlaceholderWhenFocused() const { return true; }
 
 private:
@@ -154,7 +161,7 @@
     };
 
     RenderThemeWin();
-    ~RenderThemeWin();
+    virtual ~RenderThemeWin();
 
     void addIntrinsicMargins(RenderStyle*) const;
     void close();
@@ -175,12 +182,14 @@
     HANDLE menuListTheme() const;
     HANDLE sliderTheme() const;
     HANDLE spinButtonTheme() const;
+    HANDLE progressBarTheme() const;
 
     mutable HANDLE m_buttonTheme;
     mutable HANDLE m_textFieldTheme;
     mutable HANDLE m_menuListTheme;
     mutable HANDLE m_sliderTheme;
     mutable HANDLE m_spinButtonTheme;
+    mutable HANDLE m_progressBarTheme;
 };
 
 };
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to