[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
commit-queue at webkit.org
commit-queue at webkit.org
Sun Feb 20 23:02:07 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit d8df37f3e7c09ea40d076f239edcea3d14777afb
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Jan 15 06:01:15 2011 +0000
2011-01-14 Xiyuan Xia <xiyuan at chromium.org>
Reviewed by Darin Fisher.
Prepare Linux WebThemeEngine interface to support new theme parts.
https://bugs.webkit.org/show_bug.cgi?id=52413
* public/linux/WebThemeEngine.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75871 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index fdc8e10..c0cd169 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-14 Xiyuan Xia <xiyuan at chromium.org>
+
+ Reviewed by Darin Fisher.
+
+ Prepare Linux WebThemeEngine interface to support new theme parts.
+ https://bugs.webkit.org/show_bug.cgi?id=52413
+
+ * public/linux/WebThemeEngine.h:
+
2011-01-14 Yuzo Fujishima <yuzo at google.com>
Reviewed by Antti Koivisto.
diff --git a/WebKit/chromium/public/linux/WebThemeEngine.h b/WebKit/chromium/public/linux/WebThemeEngine.h
index bd0d76b..a98f224 100644
--- a/WebKit/chromium/public/linux/WebThemeEngine.h
+++ b/WebKit/chromium/public/linux/WebThemeEngine.h
@@ -43,6 +43,7 @@ class WebThemeEngine {
public:
// The UI part which is being accessed.
enum Part {
+ // ScrollbarTheme parts
PartScrollbarDownArrow,
PartScrollbarLeftArrow,
PartScrollbarRightArrow,
@@ -50,7 +51,18 @@ public:
PartScrollbarHorizontalThumb,
PartScrollbarVerticalThumb,
PartScrollbarHorizontalTrack,
- PartScrollbarVerticalTrack
+ PartScrollbarVerticalTrack,
+
+ // RenderTheme parts
+ PartCheckbox,
+ PartRadio,
+ PartButton,
+ PartTextField,
+ PartMenuList,
+ PartSliderTrack,
+ PartSliderThumb,
+ PartInnerSpinButton,
+ PartProgressBar
};
// The current state of the associated Part.
@@ -71,8 +83,57 @@ public:
int trackHeight;
};
+ // Extra parameters for PartCheckbox, PartPushButton and PartRadio.
+ struct ButtonExtraParams {
+ bool checked;
+ bool indeterminate; // Whether the button state is indeterminate.
+ bool isDefault; // Whether the button is default button.
+ WebColor backgroundColor;
+ };
+
+ // Extra parameters for PartTextField
+ struct TextFieldExtraParams {
+ bool isTextArea;
+ bool isListbox;
+ WebColor backgroundColor;
+ };
+
+ // Extra parameters for PartMenuList
+ struct MenuListExtraParams {
+ int arrowX;
+ int arrowY;
+ WebColor backgroundColor;
+ };
+
+ // Extra parameters for PartSliderTrack and PartSliderThumb
+ struct SliderExtraParams {
+ bool vertical;
+ bool inDrag;
+ };
+
+ // Extra parameters for PartInnerSpinButton
+ struct InnerSpinButtonExtraParams {
+ bool spinUp;
+ bool readOnly;
+ };
+
+ // Extra parameters for PartProgressBar
+ struct ProgressBarExtraParams {
+ bool determinate;
+ int valueRectX;
+ int valueRectY;
+ int valueRectWidth;
+ int valueRectHeight;
+ };
+
union ExtraParams {
ScrollbarTrackExtraParams scrollbarTrack;
+ ButtonExtraParams button;
+ TextFieldExtraParams textField;
+ MenuListExtraParams menuList;
+ SliderExtraParams slider;
+ InnerSpinButtonExtraParams innerSpin;
+ ProgressBarExtraParams progressBar;
};
// Gets the size of the given theme part. For variable sized items
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list