diff options
| author | Steve Block <steveblock@google.com> | 2011-05-13 06:44:40 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-13 06:44:40 -0700 |
| commit | 08014c20784f3db5df3a89b73cce46037b77eb59 (patch) | |
| tree | 47749210d31e19e6e2f64036fa8fae2ad693476f /WebKit/chromium/public/linux/WebThemeEngine.h | |
| parent | 860220379e56aeb66424861ad602b07ee22b4055 (diff) | |
| parent | 4c3661f7918f8b3f139f824efb7855bedccb4c94 (diff) | |
| download | external_webkit-08014c20784f3db5df3a89b73cce46037b77eb59.zip external_webkit-08014c20784f3db5df3a89b73cce46037b77eb59.tar.gz external_webkit-08014c20784f3db5df3a89b73cce46037b77eb59.tar.bz2 | |
Merge changes Ide388898,Ic49f367c,I1158a808,Iacb6ca5d,I2100dd3a,I5c1abe54,Ib0ef9902,I31dbc523,I570314b3
* changes:
Merge WebKit at r75315: Update WebKit version
Merge WebKit at r75315: Add FrameLoaderClient PageCache stubs
Merge WebKit at r75315: Stub out AXObjectCache::remove()
Merge WebKit at r75315: Fix ImageBuffer
Merge WebKit at r75315: Fix PluginData::initPlugins()
Merge WebKit at r75315: Fix conflicts
Merge WebKit at r75315: Fix Makefiles
Merge WebKit at r75315: Move Android-specific WebCore files to Source
Merge WebKit at r75315: Initial merge by git.
Diffstat (limited to 'WebKit/chromium/public/linux/WebThemeEngine.h')
| -rw-r--r-- | WebKit/chromium/public/linux/WebThemeEngine.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/WebKit/chromium/public/linux/WebThemeEngine.h b/WebKit/chromium/public/linux/WebThemeEngine.h index fd72cf7..6f8cdc7 100644 --- a/WebKit/chromium/public/linux/WebThemeEngine.h +++ b/WebKit/chromium/public/linux/WebThemeEngine.h @@ -39,6 +39,9 @@ namespace WebKit { struct WebRect; +// FIXME: Remove once webkit/glue/webthemeengine_impl_linux.c has been updated to use the correct spelling. +#define PartScrollbarHoriztonalTrack PartScrollbarHorizontalTrack + class WebThemeEngine { public: // The UI part which is being accessed. @@ -49,7 +52,7 @@ public: PartScrollbarUpArrow, PartScrollbarHorizontalThumb, PartScrollbarVerticalThumb, - PartScrollbarHoriztonalTrack, + PartScrollbarHorizontalTrack, PartScrollbarVerticalTrack }; @@ -61,7 +64,7 @@ public: StatePressed, }; - // Extra parameters for drawing the PartScrollbarHoriztonalTrack and + // Extra parameters for drawing the PartScrollbarHorizontalTrack and // PartScrollbarVerticalTrack. struct ScrollbarTrackExtraParams { // The bounds of the entire track, as opposed to the part being painted. |