Rename MediaQueryExp.h/cpp to MediaQueryExpression.h/cpp
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 13 Feb 2017 23:06:26 +0000 (23:06 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 13 Feb 2017 23:06:26 +0000 (23:06 +0000)
https://bugs.webkit.org/show_bug.cgi?id=168249

Patch by Sam Weinig <sam@webkit.org> on 2017-02-13
Reviewed by Dean Jackson.

Fix a FIXME and rename MediaQueryExp.h/cpp to match the class it contains, MediaQueryExpression.

* CMakeLists.txt:
* WebCore.xcodeproj/project.pbxproj:
* css/CSSAllInOne.cpp:
* css/MediaQuery.h:
* css/MediaQueryEvaluator.h:
* css/MediaQueryExp.cpp: Removed.
* css/MediaQueryExp.h: Removed.
* css/MediaQueryExpression.cpp: Copied from Source/WebCore/css/MediaQueryExp.cpp.
* css/MediaQueryExpression.h: Copied from Source/WebCore/css/MediaQueryExp.h.
* css/parser/MediaQueryParser.h:

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

Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/css/CSSAllInOne.cpp
Source/WebCore/css/MediaQuery.h
Source/WebCore/css/MediaQueryEvaluator.h
Source/WebCore/css/MediaQueryExpression.cpp [moved from Source/WebCore/css/MediaQueryExp.cpp with 99% similarity]
Source/WebCore/css/MediaQueryExpression.h [moved from Source/WebCore/css/MediaQueryExp.h with 97% similarity]
Source/WebCore/css/parser/MediaQueryParser.h

index e410f7d..3c6f5e8 100644 (file)
@@ -1323,7 +1323,7 @@ set(WebCore_SOURCES
     css/MediaList.cpp
     css/MediaQuery.cpp
     css/MediaQueryEvaluator.cpp
-    css/MediaQueryExp.cpp
+    css/MediaQueryExpression.cpp
     css/MediaQueryList.cpp
     css/MediaQueryMatcher.cpp
     css/PageRuleCollector.cpp
index fa5d684..2c054e4 100644 (file)
@@ -1,3 +1,23 @@
+2017-02-13  Sam Weinig  <sam@webkit.org>
+
+        Rename MediaQueryExp.h/cpp to MediaQueryExpression.h/cpp
+        https://bugs.webkit.org/show_bug.cgi?id=168249
+
+        Reviewed by Dean Jackson.
+
+        Fix a FIXME and rename MediaQueryExp.h/cpp to match the class it contains, MediaQueryExpression.
+
+        * CMakeLists.txt:
+        * WebCore.xcodeproj/project.pbxproj:
+        * css/CSSAllInOne.cpp:
+        * css/MediaQuery.h:
+        * css/MediaQueryEvaluator.h:
+        * css/MediaQueryExp.cpp: Removed.
+        * css/MediaQueryExp.h: Removed.
+        * css/MediaQueryExpression.cpp: Copied from Source/WebCore/css/MediaQueryExp.cpp.
+        * css/MediaQueryExpression.h: Copied from Source/WebCore/css/MediaQueryExp.h.
+        * css/parser/MediaQueryParser.h:
+
 2017-02-13  Aakash Jain  <aakash_jain@apple.com>
 
         WAKResponder should be exported from WebCore
index 7dad644..c86b1c7 100644 (file)
                4E19592A0A39DACC00220FE5 /* MediaQuery.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E1959240A39DACC00220FE5 /* MediaQuery.h */; settings = {ATTRIBUTES = (Private, ); }; };
                4E19592B0A39DACC00220FE5 /* MediaQueryEvaluator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4E1959250A39DACC00220FE5 /* MediaQueryEvaluator.cpp */; };
                4E19592C0A39DACC00220FE5 /* MediaQueryEvaluator.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E1959260A39DACC00220FE5 /* MediaQueryEvaluator.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               4E19592D0A39DACC00220FE5 /* MediaQueryExp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4E1959270A39DACC00220FE5 /* MediaQueryExp.cpp */; };
-               4E19592E0A39DACC00220FE5 /* MediaQueryExp.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E1959280A39DACC00220FE5 /* MediaQueryExp.h */; settings = {ATTRIBUTES = (Private, ); }; };
                4F1534DE11B532EC0021FD86 /* EditingBehavior.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F1534DD11B532EC0021FD86 /* EditingBehavior.h */; settings = {ATTRIBUTES = (Private, ); }; };
                4F1534E011B533020021FD86 /* EditingBehaviorTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F1534DF11B533020021FD86 /* EditingBehaviorTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
                4F6FDD641341DEDD001F8EE3 /* InspectorPageAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F6FDD621341DEDD001F8EE3 /* InspectorPageAgent.cpp */; };
                7C93F34E1AA6BF0700A98BAB /* ContentExtensionCompiler.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C93F34C1AA6BF0700A98BAB /* ContentExtensionCompiler.h */; settings = {ATTRIBUTES = (Private, ); }; };
                7C9DBFED1A9C49B1000D6B25 /* JSHTMLAttachmentElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C9DBFEB1A9C49B1000D6B25 /* JSHTMLAttachmentElement.cpp */; };
                7C9DBFEE1A9C49B1000D6B25 /* JSHTMLAttachmentElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C9DBFEC1A9C49B1000D6B25 /* JSHTMLAttachmentElement.h */; };
+               7CB5CA3F1E525C7100FAEF13 /* MediaQueryExpression.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CB5CA3D1E525C6C00FAEF13 /* MediaQueryExpression.cpp */; };
+               7CB5CA401E525C7300FAEF13 /* MediaQueryExpression.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CB5CA3E1E525C6C00FAEF13 /* MediaQueryExpression.h */; settings = {ATTRIBUTES = (Private, ); }; };
                7CC01D0A1E4A7B0400E529CC /* JSDOMBuiltinConstructorBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C0CEF2E1E4A5832008DEB80 /* JSDOMBuiltinConstructorBase.cpp */; };
                7CC01D0B1E4A7B0400E529CC /* JSDOMConstructorBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C0CEF2F1E4A58AD008DEB80 /* JSDOMConstructorBase.cpp */; };
                7CC01D0C1E4A7B0400E529CC /* JSDOMConstructorWithDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C0CEF301E4A58F1008DEB80 /* JSDOMConstructorWithDocument.cpp */; };
                4E1959240A39DACC00220FE5 /* MediaQuery.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MediaQuery.h; sourceTree = "<group>"; };
                4E1959250A39DACC00220FE5 /* MediaQueryEvaluator.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = MediaQueryEvaluator.cpp; sourceTree = "<group>"; };
                4E1959260A39DACC00220FE5 /* MediaQueryEvaluator.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MediaQueryEvaluator.h; sourceTree = "<group>"; };
-               4E1959270A39DACC00220FE5 /* MediaQueryExp.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = MediaQueryExp.cpp; sourceTree = "<group>"; };
-               4E1959280A39DACC00220FE5 /* MediaQueryExp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MediaQueryExp.h; sourceTree = "<group>"; };
                4F1534DD11B532EC0021FD86 /* EditingBehavior.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditingBehavior.h; sourceTree = "<group>"; };
                4F1534DF11B533020021FD86 /* EditingBehaviorTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditingBehaviorTypes.h; sourceTree = "<group>"; };
                4F6FDD621341DEDD001F8EE3 /* InspectorPageAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorPageAgent.cpp; sourceTree = "<group>"; };
                7C9DBFEA1A9C489F000D6B25 /* HTMLAttachmentElement.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = HTMLAttachmentElement.idl; sourceTree = "<group>"; };
                7C9DBFEB1A9C49B1000D6B25 /* JSHTMLAttachmentElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLAttachmentElement.cpp; sourceTree = "<group>"; };
                7C9DBFEC1A9C49B1000D6B25 /* JSHTMLAttachmentElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSHTMLAttachmentElement.h; sourceTree = "<group>"; };
+               7CB5CA3D1E525C6C00FAEF13 /* MediaQueryExpression.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaQueryExpression.cpp; sourceTree = "<group>"; };
+               7CB5CA3E1E525C6C00FAEF13 /* MediaQueryExpression.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaQueryExpression.h; sourceTree = "<group>"; };
                7CC564B618BABEA6001B9652 /* TelephoneNumberDetector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TelephoneNumberDetector.h; sourceTree = "<group>"; };
                7CC564B918BAC720001B9652 /* TelephoneNumberDetectorCocoa.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TelephoneNumberDetectorCocoa.cpp; sourceTree = "<group>"; };
                7CC6993E191EC5F500AF2270 /* JSWebKitNamespace.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitNamespace.cpp; sourceTree = "<group>"; };
                                4E1959240A39DACC00220FE5 /* MediaQuery.h */,
                                4E1959250A39DACC00220FE5 /* MediaQueryEvaluator.cpp */,
                                4E1959260A39DACC00220FE5 /* MediaQueryEvaluator.h */,
-                               4E1959270A39DACC00220FE5 /* MediaQueryExp.cpp */,
-                               4E1959280A39DACC00220FE5 /* MediaQueryExp.h */,
+                               7CB5CA3D1E525C6C00FAEF13 /* MediaQueryExpression.cpp */,
+                               7CB5CA3E1E525C6C00FAEF13 /* MediaQueryExpression.h */,
                                D3A94A31122DABAC00A37BBC /* MediaQueryList.cpp */,
                                D3A94A32122DABAC00A37BBC /* MediaQueryList.h */,
                                D3A94A33122DABAC00A37BBC /* MediaQueryList.idl */,
                                CD3E251C18046B0600E27F56 /* GridArea.h in Headers */,
                                CDEF4FD717E85C8F00AEE24B /* GridLength.h in Headers */,
                                A12705C31656BD6500C2E27C /* GridPosition.h in Headers */,
+                               7CB5CA401E525C7300FAEF13 /* MediaQueryExpression.h in Headers */,
                                CDF7483F18FEBCEC0006ECC0 /* GridPositionsResolver.h in Headers */,
                                A12A1050166444FD008FA311 /* GridTrackSize.h in Headers */,
                                26EA89A71B4F2B75008C5FD2 /* HashableActionList.h in Headers */,
                                4E19592A0A39DACC00220FE5 /* MediaQuery.h in Headers */,
                                9493B6BF1D74B4120088E780 /* MediaQueryBlockWatcher.h in Headers */,
                                4E19592C0A39DACC00220FE5 /* MediaQueryEvaluator.h in Headers */,
-                               4E19592E0A39DACC00220FE5 /* MediaQueryExp.h in Headers */,
                                D3A94A39122DABAC00A37BBC /* MediaQueryList.h in Headers */,
                                D3A94A3B122DABAC00A37BBC /* MediaQueryListListener.h in Headers */,
                                D3AA10F4123A98AA0092152B /* MediaQueryMatcher.h in Headers */,
                                1A0D57400A5C7867007EDD4C /* JSOverflowEvent.cpp in Sources */,
                                E1284BB210449FFA00EAEB52 /* JSPageTransitionEvent.cpp in Sources */,
                                FDA15EB112B03EE1003A583A /* JSPannerNode.cpp in Sources */,
+                               7CB5CA3F1E525C7100FAEF13 /* MediaQueryExpression.cpp in Sources */,
                                E51A81DF17298D7700BFCA61 /* JSPerformance.cpp in Sources */,
                                CB38FD511CCF938900592A3F /* JSPerformanceEntry.cpp in Sources */,
                                CB38FD571CD21E2A00592A3F /* JSPerformanceEntryCustom.cpp in Sources */,
                                4E1959290A39DACC00220FE5 /* MediaQuery.cpp in Sources */,
                                9493B6BE1D74B4120088E780 /* MediaQueryBlockWatcher.cpp in Sources */,
                                4E19592B0A39DACC00220FE5 /* MediaQueryEvaluator.cpp in Sources */,
-                               4E19592D0A39DACC00220FE5 /* MediaQueryExp.cpp in Sources */,
                                D3A94A38122DABAC00A37BBC /* MediaQueryList.cpp in Sources */,
                                D3AA10F3123A98AA0092152B /* MediaQueryMatcher.cpp in Sources */,
                                9493B6C01D74B4120088E780 /* MediaQueryParser.cpp in Sources */,
index 6b27340..b116afa 100644 (file)
@@ -99,7 +99,7 @@
 #include "MediaList.cpp"
 #include "MediaQuery.cpp"
 #include "MediaQueryEvaluator.cpp"
-#include "MediaQueryExp.cpp"
+#include "MediaQueryExpression.cpp"
 #include "MediaQueryList.cpp"
 #include "MediaQueryMatcher.cpp"
 #include "PageRuleCollector.cpp"
index 365a3a2..cf2942e 100644 (file)
@@ -28,7 +28,7 @@
 
 #pragma once
 
-#include "MediaQueryExp.h"
+#include "MediaQueryExpression.h"
 #include <wtf/Vector.h>
 
 namespace WebCore {
index 140acff..eae5e94 100644 (file)
@@ -27,7 +27,7 @@
 
 #pragma once
 
-#include "MediaQueryExp.h"
+#include "MediaQueryExpression.h"
 
 namespace WebCore {
 
similarity index 99%
rename from Source/WebCore/css/MediaQueryExp.cpp
rename to Source/WebCore/css/MediaQueryExpression.cpp
index eef58a6..91eb304 100644 (file)
@@ -26,7 +26,7 @@
  */
 
 #include "config.h"
-#include "MediaQueryExp.h"
+#include "MediaQueryExpression.h"
 
 #include "CSSAspectRatioValue.h"
 #include "CSSParser.h"
similarity index 97%
rename from Source/WebCore/css/MediaQueryExp.h
rename to Source/WebCore/css/MediaQueryExpression.h
index 2251e9f..290d8ea 100644 (file)
@@ -33,7 +33,6 @@
 
 namespace WebCore {
 
-// FIXME: Rename the file to match this class's name.
 class MediaQueryExpression {
     WTF_MAKE_FAST_ALLOCATED;
 public:
index 98ab40f..e51d6c3 100644 (file)
@@ -34,7 +34,7 @@
 #include "MediaList.h"
 #include "MediaQuery.h"
 #include "MediaQueryBlockWatcher.h"
-#include "MediaQueryExp.h"
+#include "MediaQueryExpression.h"
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {