Title: [88419] trunk/Tools
- Revision
- 88419
- Author
- [email protected]
- Date
- 2011-06-08 21:47:27 -0700 (Wed, 08 Jun 2011)
Log Message
2011-06-08 Kent Tamura <[email protected]>
Reviewed by Hajime Morita.
[Chromium] Support vertical sliders in Windows DRT
https://bugs.webkit.org/show_bug.cgi?id=62352
* DumpRenderTree/chromium/WebThemeControlDRTWin.cpp:
(WebThemeControlDRTWin::draw):
Paint VerticalSliderThumbType and VerticalSliderTrackType.
* DumpRenderTree/chromium/WebThemeControlDRTWin.h:
Add VerticalSliderTrackType and VerticalSliderThumbType.
* DumpRenderTree/chromium/WebThemeEngineDRTWin.cpp:
(WebThemeEngineDRTWin::paintTrackbar):
Convert Windows identifiers to the internal identifiers for vertical sliders.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (88418 => 88419)
--- trunk/Tools/ChangeLog 2011-06-09 03:55:17 UTC (rev 88418)
+++ trunk/Tools/ChangeLog 2011-06-09 04:47:27 UTC (rev 88419)
@@ -1,3 +1,19 @@
+2011-06-08 Kent Tamura <[email protected]>
+
+ Reviewed by Hajime Morita.
+
+ [Chromium] Support vertical sliders in Windows DRT
+ https://bugs.webkit.org/show_bug.cgi?id=62352
+
+ * DumpRenderTree/chromium/WebThemeControlDRTWin.cpp:
+ (WebThemeControlDRTWin::draw):
+ Paint VerticalSliderThumbType and VerticalSliderTrackType.
+ * DumpRenderTree/chromium/WebThemeControlDRTWin.h:
+ Add VerticalSliderTrackType and VerticalSliderThumbType.
+ * DumpRenderTree/chromium/WebThemeEngineDRTWin.cpp:
+ (WebThemeEngineDRTWin::paintTrackbar):
+ Convert Windows identifiers to the internal identifiers for vertical sliders.
+
2011-06-08 Ojan Vafai <[email protected]>
Reviewed by Tony Chang.
Modified: trunk/Tools/DumpRenderTree/chromium/WebThemeControlDRTWin.cpp (88418 => 88419)
--- trunk/Tools/DumpRenderTree/chromium/WebThemeControlDRTWin.cpp 2011-06-09 03:55:17 UTC (rev 88418)
+++ trunk/Tools/DumpRenderTree/chromium/WebThemeControlDRTWin.cpp 2011-06-09 04:47:27 UTC (rev 88419)
@@ -388,6 +388,7 @@
break;
case HorizontalSliderThumbType:
+ case VerticalSliderThumbType:
// Slider thumbs are ovals.
oval(m_bgColor);
break;
@@ -459,6 +460,17 @@
break;
}
+ case VerticalSliderTrackType: {
+ // Draw a narrow rect for the track plus box hatches on the ends.
+ SkIRect lirect;
+ lirect = m_irect;
+ lirect.inset(halfWidth - sliderIndex, noOffset);
+ box(lirect, m_bgColor);
+ line(m_left, m_top, m_right, m_top, m_edgeColor);
+ line(m_left, m_bottom, m_right, m_bottom, m_edgeColor);
+ break;
+ }
+
case DropDownButtonType:
// Draw a box with a big down arrow on top.
box(m_irect, m_bgColor);
Modified: trunk/Tools/DumpRenderTree/chromium/WebThemeControlDRTWin.h (88418 => 88419)
--- trunk/Tools/DumpRenderTree/chromium/WebThemeControlDRTWin.h 2011-06-09 03:55:17 UTC (rev 88418)
+++ trunk/Tools/DumpRenderTree/chromium/WebThemeControlDRTWin.h 2011-06-09 04:47:27 UTC (rev 88419)
@@ -116,6 +116,8 @@
DownArrowType,
HorizontalSliderTrackType,
HorizontalSliderThumbType,
+ VerticalSliderTrackType,
+ VerticalSliderThumbType,
DropDownButtonType,
ProgressBarType
};
Modified: trunk/Tools/DumpRenderTree/chromium/WebThemeEngineDRTWin.cpp (88418 => 88419)
--- trunk/Tools/DumpRenderTree/chromium/WebThemeEngineDRTWin.cpp 2011-06-09 03:55:17 UTC (rev 88418)
+++ trunk/Tools/DumpRenderTree/chromium/WebThemeEngineDRTWin.cpp 2011-06-09 04:47:27 UTC (rev 88419)
@@ -729,11 +729,43 @@
ASSERT_NOT_REACHED();
break;
}
+ } else if (TKP_THUMBVERT == part) {
+ ctype = WebThemeControlDRTWin::VerticalSliderThumbType;
+ switch (state) {
+ case TUS_NORMAL:
+ ASSERT(classicState == dfcsNormal);
+ cstate = WebThemeControlDRTWin::NormalState;
+ break;
+
+ case TUS_HOT:
+ ASSERT(classicState == DFCS_HOT);
+ cstate = WebThemeControlDRTWin::HotState;
+ break;
+
+ case TUS_DISABLED:
+ ASSERT(classicState == DFCS_INACTIVE);
+ cstate = WebThemeControlDRTWin::DisabledState;
+ break;
+
+ case TUS_PRESSED:
+ ASSERT(classicState == DFCS_PUSHED);
+ cstate = WebThemeControlDRTWin::PressedState;
+ break;
+
+ default:
+ ASSERT_NOT_REACHED();
+ break;
+ }
} else if (TKP_TRACK == part) {
ctype = WebThemeControlDRTWin::HorizontalSliderTrackType;
ASSERT(part == TUS_NORMAL);
ASSERT(classicState == dfcsNormal);
cstate = WebThemeControlDRTWin::NormalState;
+ } else if (TKP_TRACKVERT == part) {
+ ctype = WebThemeControlDRTWin::VerticalSliderTrackType;
+ ASSERT(part == TUS_NORMAL);
+ ASSERT(classicState == dfcsNormal);
+ cstate = WebThemeControlDRTWin::NormalState;
} else
ASSERT_NOT_REACHED();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
