diff options
| author | mpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-04 20:44:10 +0000 |
|---|---|---|
| committer | mpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-04 20:44:10 +0000 |
| commit | f3208bd4c625527d854c3bf49908352199488c48 (patch) | |
| tree | 6167b4d23df6c9f76d155066b35130ae28b1cd9b | |
| parent | c32af058c8daf650b18034e28e61be911eca4f77 (diff) | |
| download | chromium_src-f3208bd4c625527d854c3bf49908352199488c48.zip chromium_src-f3208bd4c625527d854c3bf49908352199488c48.tar.gz chromium_src-f3208bd4c625527d854c3bf49908352199488c48.tar.bz2 | |
Incorporate upstream changes to the CSS rules to our port. Related webkit
bug: https://bugs.webkit.org/show_bug.cgi?id=22051
Review URL: http://codereview.chromium.org/10424
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6386 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/port/DerivedSources.make | 8 | ||||
| -rw-r--r-- | webkit/port/rendering/RenderThemeWin.cpp | 12 | ||||
| -rw-r--r-- | webkit/port/rendering/RenderThemeWin.h | 3 |
3 files changed, 18 insertions, 5 deletions
diff --git a/webkit/port/DerivedSources.make b/webkit/port/DerivedSources.make index ae7c2a5..1b45fae 100644 --- a/webkit/port/DerivedSources.make +++ b/webkit/port/DerivedSources.make @@ -1010,11 +1010,9 @@ XPathGrammar.cpp : xml/XPathGrammar.y $(PROJECT_FILE) # user agent style sheets -USER_AGENT_STYLE_SHEETS = $(WebCore)/css/view-source.css $(WebCore)/css/svg.css -UserAgentStyleSheets.h : css/make-css-file-arrays.pl $(USER_AGENT_STYLE_SHEETS) $(WebCore)/css/html4.css $(PORTROOT)/css/html4-overrides.css $(PORTROOT)/css/quirks-overrides.css - cat $(WebCore)/css/html4.css $(PORTROOT)/css/html4-overrides.css > $(DerivedSourcesDir)/html4.css - cat $(WebCore)/css/quirks.css $(PORTROOT)/css/quirks-overrides.css > $(DerivedSourcesDir)/quirks.css - perl $< $@ UserAgentStyleSheetsData.cpp $(DerivedSourcesDir)/html4.css $(DerivedSourcesDir)/quirks.css $(USER_AGENT_STYLE_SHEETS) +USER_AGENT_STYLE_SHEETS = $(WebCore)/css/html4.css $(WebCore)/css/quirks.css $(WebCore)/css/view-source.css $(WebCore)/css/svg.css $(WebCore)/css/wml.css $(WebCore)/css/themeWin.css $(WebCore)/css/themeWinQuirks.css +UserAgentStyleSheets.h : css/make-css-file-arrays.pl $(USER_AGENT_STYLE_SHEETS) + perl $< $@ UserAgentStyleSheetsData.cpp $(USER_AGENT_STYLE_SHEETS) # character set name table diff --git a/webkit/port/rendering/RenderThemeWin.cpp b/webkit/port/rendering/RenderThemeWin.cpp index a4614c1..d57524f 100644 --- a/webkit/port/rendering/RenderThemeWin.cpp +++ b/webkit/port/rendering/RenderThemeWin.cpp @@ -28,6 +28,7 @@ #include <vssym32.h> #include "ChromiumBridge.h" +#include "CSSStyleSheet.h" #include "CSSValueKeywords.h" #include "Document.h" #include "FontSelector.h" @@ -36,6 +37,7 @@ #include "ScrollbarTheme.h" #include "SkiaUtils.h" #include "ThemeHelperWin.h" +#include "UserAgentStyleSheets.h" // TODO(brettw) all of these dependencies should eventually be removed. #include "base/gfx/native_theme.h" @@ -199,6 +201,16 @@ RenderTheme* theme() return &winTheme; } +String RenderThemeWin::extraDefaultStyleSheet() +{ + return String(themeWinUserAgentStyleSheet, sizeof(themeWinUserAgentStyleSheet)); +} + +String RenderThemeWin::extraQuirksStyleSheet() +{ + return String(themeWinQuirksUserAgentStyleSheet, sizeof(themeWinQuirksUserAgentStyleSheet)); +} + bool RenderThemeWin::supportsFocusRing(const RenderStyle* style) const { // Let webkit draw one of its halo rings around any focused element, diff --git a/webkit/port/rendering/RenderThemeWin.h b/webkit/port/rendering/RenderThemeWin.h index 5c16330..cd9cb4c 100644 --- a/webkit/port/rendering/RenderThemeWin.h +++ b/webkit/port/rendering/RenderThemeWin.h @@ -46,6 +46,9 @@ public: RenderThemeWin() { } ~RenderThemeWin() { } + virtual String extraDefaultStyleSheet(); + virtual String extraQuirksStyleSheet(); + // A method asking if the theme's controls actually care about redrawing when hovered. virtual bool supportsHover(const RenderStyle*) const { return true; } |