Bug 138763 – Rename WebKitCSSKeyframe(s)Rule into CSSKeyframe(s)Rule

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Dean Jackson]

Rename WebKitCSSKeyframe(s)Rule into CSSKeyframe(s)Rule

[Radar WebKit Bug Importer]

<rdar://problem/18991569>

[Dean Jackson]

Created attachment 241646 [details]
Patch

[WebKit Commit Bot]

Attachment 241646 [details] did not pass style-queue:


ERROR: Source/WebCore/css/CSSRule.h:52:  enum members should use InterCaps with an initial capital letter.  [readability/enum_casing] [4]
ERROR: Source/WebCore/css/CSSRule.h:53:  enum members should use InterCaps with an initial capital letter.  [readability/enum_casing] [4]
ERROR: Source/WebCore/css/CSSRule.h:64:  enum members should use InterCaps with an initial capital letter.  [readability/enum_casing] [4]
ERROR: Source/WebCore/css/CSSRule.h:65:  enum members should use InterCaps with an initial capital letter.  [readability/enum_casing] [4]
Total errors found: 4 in 41 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Simon Fraser (smfr)]

Comment on attachment 241646 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=241646&action=review

> Source/WebCore/WebCore.xcodeproj/project.pbxproj:8259
> +		316FE0780E6CCC2800BF6088 /* DOMCSSKeyframeRule.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = DOMCSSKeyframeRule.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };

Not sure why this xcLanguageSpecificationIdentifier = xcode.lang.objcpp stuff is here.

> Source/WebCore/WebCore.xcodeproj/project.pbxproj:9287
> +		6565814409D13043000E61D7 /* CSSGrammar.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = CSSGrammar.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };

xcLanguageSpecificationIdentifier = xcode.lang.cpp; here also odd.

> LayoutTests/ChangeLog:25
> +        * platform/ios-sim-deprecated/fast/dom/Window/window-property-descriptors-expected.txt:
> +        * platform/ios-sim-deprecated/fast/js/global-constructors-expected.txt:
> +        * platform/ios-sim-deprecated/js/dom/global-constructors-attributes-expected.txt:

No need to touch ios-sim-deprecated.

[Dean Jackson]

(In reply to comment #4)

> 
> Not sure why this xcLanguageSpecificationIdentifier = xcode.lang.objcpp
> stuff is here.

Seems like newer versions of Xcode are spewing it out. We have a bunch already in the project.

[Dean Jackson]

GTK error is a bit weird:

/home/rego/checkout/WebKit/WebKitBuild/Release/DerivedSources/WebCore/CSSGrammar.y:39:35: fatal error: WebKitCSSKeyframeRule.h: No such file or directory
 #include "WebKitCSSKeyframeRule.h"

Which is true, but the patch explicitly includes the newly named file:

$ git diff HEAD Source/WebCore/css/CSSGrammar.y.includes
diff --git a/Source/WebCore/css/CSSGrammar.y.includes b/Source/WebCore/css/CSSGrammar.y.includes
index 44e45fc..7f8e881 100644
--- a/Source/WebCore/css/CSSGrammar.y.includes
+++ b/Source/WebCore/css/CSSGrammar.y.includes
@@ -36,8 +36,8 @@
 #include "MediaQueryExp.h"
 #include "StyleRule.h"
 #include "StyleSheetContents.h"
-#include "WebKitCSSKeyframeRule.h"
-#include "WebKitCSSKeyframesRule.h"
+#include "CSSKeyframeRule.h"
+#include "CSSKeyframesRule.h"
 #include <wtf/FastMalloc.h>
 #include <stdlib.h>
 #include <string.h>

Did it not do a clean build? Did it not see that the .includes file changed?

[Dean Jackson]

Created attachment 241648 [details]
Patch

[Dean Jackson]

New patch that tries to add CSSGrammar.y.includes to the CMake dependencies. But I don't have much idea about what I'm doing in there.

[WebKit Commit Bot]

Attachment 241648 [details] did not pass style-queue:


ERROR: Source/WebCore/css/CSSRule.h:52:  enum members should use InterCaps with an initial capital letter.  [readability/enum_casing] [4]
ERROR: Source/WebCore/css/CSSRule.h:53:  enum members should use InterCaps with an initial capital letter.  [readability/enum_casing] [4]
ERROR: Source/WebCore/css/CSSRule.h:64:  enum members should use InterCaps with an initial capital letter.  [readability/enum_casing] [4]
ERROR: Source/WebCore/css/CSSRule.h:65:  enum members should use InterCaps with an initial capital letter.  [readability/enum_casing] [4]
Total errors found: 4 in 38 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Dean Jackson]

That didn't help GTK.

ninja: error: 'DerivedSources/WebCore/CSSGrammar.y.in', needed by 'Source/WebCore/CMakeFiles/WebCore.dir/__/__/DerivedSources/WebCore/CSSGrammar.cpp.o', missing and no known rule to make it

Not sure why it thinks it should be in DerivedSources.

[Dean Jackson]

Created attachment 241650 [details]
Patch

[Dean Jackson]

Attempt 3 for CMake.

[WebKit Commit Bot]

Attachment 241650 [details] did not pass style-queue:


ERROR: Source/WebCore/css/CSSRule.h:52:  enum members should use InterCaps with an initial capital letter.  [readability/enum_casing] [4]
ERROR: Source/WebCore/css/CSSRule.h:53:  enum members should use InterCaps with an initial capital letter.  [readability/enum_casing] [4]
ERROR: Source/WebCore/css/CSSRule.h:64:  enum members should use InterCaps with an initial capital letter.  [readability/enum_casing] [4]
ERROR: Source/WebCore/css/CSSRule.h:65:  enum members should use InterCaps with an initial capital letter.  [readability/enum_casing] [4]
Total errors found: 4 in 38 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Dean Jackson]

Created attachment 241658 [details]
Patch

[WebKit Commit Bot]

Attachment 241658 [details] did not pass style-queue:


ERROR: Source/WebCore/css/CSSRule.h:52:  enum members should use InterCaps with an initial capital letter.  [readability/enum_casing] [4]
ERROR: Source/WebCore/css/CSSRule.h:53:  enum members should use InterCaps with an initial capital letter.  [readability/enum_casing] [4]
ERROR: Source/WebCore/css/CSSRule.h:64:  enum members should use InterCaps with an initial capital letter.  [readability/enum_casing] [4]
ERROR: Source/WebCore/css/CSSRule.h:65:  enum members should use InterCaps with an initial capital letter.  [readability/enum_casing] [4]
Total errors found: 4 in 39 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Build Bot]

Comment on attachment 241658 [details]
Patch

Attachment 241658 [details] did not pass mac-wk2-ews (mac-wk2):
Output: http://webkit-queues.appspot.com/results/6023956737818624

New failing tests:
js/dom/global-constructors-attributes.html

[Build Bot]

Created attachment 241659 [details]
Archive of layout-test-results from webkit-ews-14 for mac-mountainlion-wk2

The attached test failures were seen while running run-webkit-tests on the mac-wk2-ews.
Bot: webkit-ews-14  Port: mac-mountainlion-wk2  Platform: Mac OS X 10.8.5

[Build Bot]

Comment on attachment 241658 [details]
Patch

Attachment 241658 [details] did not pass mac-ews (mac):
Output: http://webkit-queues.appspot.com/results/6499008038043648

New failing tests:
js/dom/global-constructors-attributes.html

[Build Bot]

Created attachment 241661 [details]
Archive of layout-test-results from webkit-ews-05 for mac-mountainlion

The attached test failures were seen while running run-webkit-tests on the mac-ews.
Bot: webkit-ews-05  Port: mac-mountainlion  Platform: Mac OS X 10.8.5

[Dean Jackson]

Committed r176157: <http://trac.webkit.org/changeset/176157>