2009-06-30 Maciej Stachowiak <mjs@apple.com>

        Reviewed by Sam Weinig.

        - Rename html4.css to html.css, since we target HTML5 now
        https://bugs.webkit.org/show_bug.cgi?id=26873

        * DerivedSources.make:
        * GNUmakefile.am:
        * WebCore.pro:
        * WebCore.vcproj/WebCore.vcproj:
        * WebCore.xcodeproj/project.pbxproj:
        * css/CSSStyleSelector.cpp:
        (WebCore::loadFullDefaultStyle):
        * css/html.css: Copied from css/html4.css.
        * css/html4.css: Removed.
        * css/themeWin.css:
        * platform/Theme.h:
        * platform/qt/RenderThemeQt.cpp:
        (WebCore::RenderThemeQt::adjustMenuListButtonStyle):
        * rendering/RenderTheme.h:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@45419 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 06795b160995ab9c47c3d44cc05024cda4d4bde1..b430f0acd2097f47129fda0debdceacc9b181576 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,25 @@
+2009-06-30  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        - Rename html4.css to html.css, since we target HTML5 now
+        https://bugs.webkit.org/show_bug.cgi?id=26873
+
+        * DerivedSources.make:
+        * GNUmakefile.am:
+        * WebCore.pro:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * css/CSSStyleSelector.cpp:
+        (WebCore::loadFullDefaultStyle):
+        * css/html.css: Copied from css/html4.css.
+        * css/html4.css: Removed.
+        * css/themeWin.css:
+        * platform/Theme.h:
+        * platform/qt/RenderThemeQt.cpp:
+        (WebCore::RenderThemeQt::adjustMenuListButtonStyle):
+        * rendering/RenderTheme.h:
+
 2009-06-30  Zan Dobersek  <zandobersek@gmail.com>
 
         Reviewed by Gustavo Noronha.

diff --git a/WebCore/DerivedSources.make b/WebCore/DerivedSources.make
index 2151edd0740f91e9c2d0b32a7ee825bf464b8872..6f1f654466eb33a1f399dc487982f8792a36d3f5 100644 (file)
--- a/WebCore/DerivedSources.make
+++ b/WebCore/DerivedSources.make
@@ -520,7 +520,7 @@ XPathGrammar.cpp : xml/XPathGrammar.y $(PROJECT_FILE)
 
 # user agent style sheets
 
-USER_AGENT_STYLE_SHEETS = $(WebCore)/css/html4.css $(WebCore)/css/quirks.css $(WebCore)/css/view-source.css $(WebCore)/css/themeWin.css $(WebCore)/css/themeWinQuirks.css 
+USER_AGENT_STYLE_SHEETS = $(WebCore)/css/html.css $(WebCore)/css/quirks.css $(WebCore)/css/view-source.css $(WebCore)/css/themeWin.css $(WebCore)/css/themeWinQuirks.css 
 
 ifeq ($(findstring ENABLE_SVG,$(FEATURE_DEFINES)), ENABLE_SVG)
     USER_AGENT_STYLE_SHEETS := $(USER_AGENT_STYLE_SHEETS) $(WebCore)/css/svg.css 

diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index babd5ef0fb6c79ed25bda1b0cb0fef8f2a87c240..e6c2582e462ffdb2ec769b5d80fe620a62edceb4 100644 (file)
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -3102,7 +3102,7 @@ DerivedSources/CSSGrammar.cpp: $(WebCore)/css/CSSGrammar.y
 
 # user agent style sheets
 USER_AGENT_STYLE_SHEETS = \
-       $(WebCore)/css/html4.css \
+       $(WebCore)/css/html.css \
        $(WebCore)/css/quirks.css \
        $(WebCore)/css/view-source.css \
        $(WebCore)/css/svg.css \
@@ -3222,7 +3222,7 @@ webcore_dist += \
        WebCore/bindings/scripts/InFilesParser.pm \
        WebCore/bindings/scripts/generate-bindings.pl \
        WebCore/bindings/scripts/CodeGeneratorJS.pm \
-       WebCore/css/html4.css \
+       WebCore/css/html.css \
        WebCore/css/quirks.css \
        WebCore/css/view-source.css \
        WebCore/css/svg.css \

diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index dbff33b9b1414560410f83701b0653f93e4f2020..0427283ff080484959f8bdedf21c6020fe39488b 100644 (file)
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -252,7 +252,7 @@ SVGCSSPROPERTIES = $$PWD/css/SVGCSSPropertyNames.in
 SVGCSSVALUES = $$PWD/css/SVGCSSValueKeywords.in
 
 STYLESHEETS_EMBED = \
-    $$PWD/css/html4.css \
+    $$PWD/css/html.css \
     $$PWD/css/quirks.css \
     $$PWD/css/svg.css \
     $$PWD/css/view-source.css \

diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index f929ff55c5693f18ec0efa55cea027f8705cb3c1..9352fe2c56c80a9b175a2fa63e5837307b86e121 100644 (file)
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -21531,7 +21531,7 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\css\html4.css"\r
+                               RelativePath="..\css\html.css"\r
                                >\r
                        </File>\r
                        <File\r

diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index ed4b085f5bd6565b9651eb3c526864f9ca645038..78138cb60bde34073b584b69eeda1525be2bb212 100644 (file)
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -6983,7 +6983,7 @@
                93C441FF0F813AE100C1A634 /* CollectionType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CollectionType.h; sourceTree = "<group>"; };
                93C841F709CE855C00DFF5E5 /* DOMImplementationFront.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMImplementationFront.h; sourceTree = "<group>"; };
                93C841FE09CE858300DFF5E5 /* DOMImplementationFront.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMImplementationFront.cpp; sourceTree = "<group>"; };
-               93CA4C9909DF93FA00DF8677 /* html4.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = html4.css; sourceTree = "<group>"; };
+               93CA4C9909DF93FA00DF8677 /* html.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = html.css; sourceTree = "<group>"; };
                93CA4C9A09DF93FA00DF8677 /* make-css-file-arrays.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = "make-css-file-arrays.pl"; sourceTree = "<group>"; };
                93CA4C9B09DF93FA00DF8677 /* makeprop.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = makeprop.pl; sourceTree = "<group>"; };
                93CA4C9C09DF93FA00DF8677 /* maketokenizer */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = maketokenizer; sourceTree = "<group>"; };
@@ -14199,7 +14199,7 @@
                                BC9ADD7F0CC4092200098C4C /* WebKitCSSTransformValue.cpp */,
                                BC9ADD220CC4032600098C4C /* WebKitCSSTransformValue.h */,
                                31611E540E1C4D4A00F6A579 /* WebKitCSSTransformValue.idl */,
-                               93CA4C9909DF93FA00DF8677 /* html4.css */,
+                               93CA4C9909DF93FA00DF8677 /* html.css */,
                                93CA4C9A09DF93FA00DF8677 /* make-css-file-arrays.pl */,
                                93CA4C9B09DF93FA00DF8677 /* makeprop.pl */,
                                93CA4C9D09DF93FA00DF8677 /* makevalues.pl */,

diff --git a/WebCore/css/CSSStyleSelector.cpp b/WebCore/css/CSSStyleSelector.cpp
index ce4c34361774ea81bdf3a84da16cd9c2817d4b55..964ad463e63963744829a771f37a92eb053fa7d5 100644 (file)
--- a/WebCore/css/CSSStyleSelector.cpp
+++ b/WebCore/css/CSSStyleSelector.cpp
@@ -526,7 +526,7 @@ static void loadFullDefaultStyle()
     }
 
     // Strict-mode rules.
-    String defaultRules = String(html4UserAgentStyleSheet, sizeof(html4UserAgentStyleSheet)) + RenderTheme::defaultTheme()->extraDefaultStyleSheet();
+    String defaultRules = String(htmlUserAgentStyleSheet, sizeof(htmlUserAgentStyleSheet)) + RenderTheme::defaultTheme()->extraDefaultStyleSheet();
     CSSStyleSheet* defaultSheet = parseUASheet(defaultRules);
     defaultStyle->addRulesFromSheet(defaultSheet, screenEval());
     defaultPrintStyle->addRulesFromSheet(defaultSheet, printEval());

diff --git a/WebCore/css/html4.css b/WebCore/css/html.css
similarity index 100%
rename from WebCore/css/html4.css
rename to WebCore/css/html.css

diff --git a/WebCore/css/themeWin.css b/WebCore/css/themeWin.css
index 421fed0da9fb7cff53bcbe6e20d60ca6c13434a0..a0170ac47ecf1e4225bdb92fd1d73813b6e95619 100644 (file)
--- a/WebCore/css/themeWin.css
+++ b/WebCore/css/themeWin.css
@@ -29,7 +29,7 @@
  */
 
 /* These styles override the default styling for HTML elements as defined in
-   WebCore/css/html4.css. So far we have used this file exclusively for
+   WebCore/css/html.css. So far we have used this file exclusively for
    making our form elements match Firefox's. */
 
 input:not([type]), 

diff --git a/WebCore/platform/Theme.h b/WebCore/platform/Theme.h
index 5574bd754ef290436614baf31c0fc235fa04cb37..f211576fa70c4513d682a2b6a596aecc4153894c 100644 (file)
--- a/WebCore/platform/Theme.h
+++ b/WebCore/platform/Theme.h
@@ -106,7 +106,7 @@ public:
     virtual void inflateControlPaintRect(ControlPart, ControlStates, IntRect& /*zoomedRect*/, float /*zoomFactor*/) const { }
     
     // This method is called once, from RenderTheme::adjustDefaultStyleSheet(), to let each platform adjust
-    // the default CSS rules in html4.css.
+    // the default CSS rules in html.css.
     static String defaultStyleSheet();
 
 private:

diff --git a/WebCore/platform/qt/RenderThemeQt.cpp b/WebCore/platform/qt/RenderThemeQt.cpp
index 4a6df0af4c0130d05d5b63e5de82f45c562eab69..0b42e5c62430569011614733776373473c027362 100644 (file)
--- a/WebCore/platform/qt/RenderThemeQt.cpp
+++ b/WebCore/platform/qt/RenderThemeQt.cpp
@@ -608,7 +608,7 @@ bool RenderThemeQt::paintMenuList(RenderObject* o, const RenderObject::PaintInfo
 void RenderThemeQt::adjustMenuListButtonStyle(CSSStyleSelector* selector, RenderStyle* style,
                                               Element* e) const
 {
-    // WORKAROUND because html4.css specifies -webkit-border-radius for <select> so we override it here
+    // WORKAROUND because html.css specifies -webkit-border-radius for <select> so we override it here
     // see also http://bugs.webkit.org/show_bug.cgi?id=18399
     style->resetBorderRadius();
 

diff --git a/WebCore/rendering/RenderTheme.h b/WebCore/rendering/RenderTheme.h
index a1519ce2dbbd92d79a31a6943291a80eba17bfa3..eb6d4412e962a758701dc436cb1487f58b2edafe 100644 (file)
--- a/WebCore/rendering/RenderTheme.h
+++ b/WebCore/rendering/RenderTheme.h
@@ -78,7 +78,7 @@ public:
     // RenderThemeMac.cpp for Mac OS X.
 
     // These methods return the theme's extra style sheets rules, to let each platform
-    // adjust the default CSS rules in html4.css, quirks.css, or mediaControls.css
+    // adjust the default CSS rules in html.css, quirks.css, or mediaControls.css
     virtual String extraDefaultStyleSheet() { return String(); }
     virtual String extraQuirksStyleSheet() { return String(); }
 #if ENABLE(VIDEO)