Move ContentSecurityPolicy.{cpp, h} to its own directory
authordbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 28 Jan 2016 01:08:03 +0000 (01:08 +0000)
committerdbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 28 Jan 2016 01:08:03 +0000 (01:08 +0000)
https://bugs.webkit.org/show_bug.cgi?id=153527
<rdar://problem/24359892>

Reviewed by Sam Weinig.

Source/WebCore:

Move ContentSecurityPolicy.{cpp, h} from Source/WebCore/page to Source/WebCore/page/csp.
This will facilitate separating out the policy support classes (e.g. CSPDirectiveList)
into their own files to improve the hackability of this code.

* CMakeLists.txt:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* page/csp/ContentSecurityPolicy.cpp: Renamed from Source/WebCore/page/ContentSecurityPolicy.cpp.
* page/csp/ContentSecurityPolicy.h: Renamed from Source/WebCore/page/ContentSecurityPolicy.h.

Source/WebKit2:

Add ${WEBCORE_DIR}/page/csp to the list of WebKit2 include directories.

* CMakeLists.txt:

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

Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/page/csp/ContentSecurityPolicy.cpp [moved from Source/WebCore/page/ContentSecurityPolicy.cpp with 100% similarity]
Source/WebCore/page/csp/ContentSecurityPolicy.h [moved from Source/WebCore/page/ContentSecurityPolicy.h with 100% similarity]
Source/WebKit2/CMakeLists.txt
Source/WebKit2/ChangeLog

index f6ffdf7..559c1ba 100644 (file)
@@ -64,6 +64,7 @@ set(WebCore_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/mathml"
     "${WEBCORE_DIR}/page"
     "${WEBCORE_DIR}/page/animation"
+    "${WEBCORE_DIR}/page/csp"
     "${WEBCORE_DIR}/page/scrolling"
     "${WEBCORE_DIR}/platform"
     "${WEBCORE_DIR}/platform/animation"
@@ -1990,7 +1991,6 @@ set(WebCore_SOURCES
     page/BarProp.cpp
     page/CaptionUserPreferences.cpp
     page/Chrome.cpp
-    page/ContentSecurityPolicy.cpp
     page/ContextMenuContext.cpp
     page/ContextMenuController.cpp
     page/Crypto.cpp
@@ -2066,6 +2066,8 @@ set(WebCore_SOURCES
     page/animation/ImplicitAnimation.cpp
     page/animation/KeyframeAnimation.cpp
 
+    page/csp/ContentSecurityPolicy.cpp
+
     page/scrolling/AxisScrollSnapOffsets.cpp
     page/scrolling/ScrollLatchingState.cpp
     page/scrolling/ScrollingConstraints.cpp
index 2f9eb42..da8f389 100644 (file)
@@ -1,3 +1,22 @@
+2016-01-27  Daniel Bates  <dabates@apple.com>
+
+        Move ContentSecurityPolicy.{cpp, h} to its own directory
+        https://bugs.webkit.org/show_bug.cgi?id=153527
+        <rdar://problem/24359892>
+
+        Reviewed by Sam Weinig.
+
+        Move ContentSecurityPolicy.{cpp, h} from Source/WebCore/page to Source/WebCore/page/csp.
+        This will facilitate separating out the policy support classes (e.g. CSPDirectiveList)
+        into their own files to improve the hackability of this code.
+
+        * CMakeLists.txt:
+        * WebCore.vcxproj/WebCore.vcxproj:
+        * WebCore.vcxproj/WebCore.vcxproj.filters:
+        * WebCore.xcodeproj/project.pbxproj:
+        * page/csp/ContentSecurityPolicy.cpp: Renamed from Source/WebCore/page/ContentSecurityPolicy.cpp.
+        * page/csp/ContentSecurityPolicy.h: Renamed from Source/WebCore/page/ContentSecurityPolicy.h.
+
 2016-01-27  Brady Eidson  <beidson@apple.com>
 
         Modern IDB: Incorrect handling of iterating cursors to their end.
index 9059722..2447fe4 100644 (file)
     </ClCompile>
     <ClCompile Include="..\page\Chrome.cpp" />
     <ClCompile Include="..\page\animation\CompositeAnimation.cpp" />
-    <ClCompile Include="..\page\ContentSecurityPolicy.cpp" />
+    <ClCompile Include="..\page\csp\ContentSecurityPolicy.cpp" />
     <ClCompile Include="..\page\ContextMenuContext.cpp" />
     <ClCompile Include="..\page\ContextMenuController.cpp" />
     <ClCompile Include="..\page\Crypto.cpp" />
     <ClInclude Include="..\page\Chrome.h" />
     <ClInclude Include="..\page\ChromeClient.h" />
     <ClInclude Include="..\page\animation\CompositeAnimation.h" />
-    <ClInclude Include="..\page\ContentSecurityPolicy.h" />
+    <ClInclude Include="..\page\csp\ContentSecurityPolicy.h" />
     <ClInclude Include="..\page\ContextMenuClient.h" />
     <ClInclude Include="..\page\ContextMenuContext.h" />
     <ClInclude Include="..\page\ContextMenuController.h" />
index 18e49ca..64d4bf5 100644 (file)
     <ClCompile Include="..\page\animation\CompositeAnimation.cpp">
       <Filter>page</Filter>
     </ClCompile>
-    <ClCompile Include="..\page\ContentSecurityPolicy.cpp">
-      <Filter>page</Filter>
+    <ClCompile Include="..\page\csp\ContentSecurityPolicy.cpp">
+      <Filter>page\csp</Filter>
     </ClCompile>
     <ClCompile Include="..\page\ContextMenuController.cpp">
       <Filter>page</Filter>
     <ClInclude Include="..\page\animation\CompositeAnimation.h">
       <Filter>page</Filter>
     </ClInclude>
-    <ClInclude Include="..\page\ContentSecurityPolicy.h">
-      <Filter>page</Filter>
+    <ClInclude Include="..\page\csp\ContentSecurityPolicy.h">
+      <Filter>page\csp</Filter>
     </ClInclude>
     <ClInclude Include="..\page\ContextMenuClient.h">
       <Filter>page</Filter>
index 7dcf92e..117cb36 100644 (file)
                97C1F552122855CB00EDE615 /* HTMLStackItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLStackItem.h; sourceTree = "<group>"; };
                97C1F552122855CB00EDE616 /* HTMLToken.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLToken.h; sourceTree = "<group>"; };
                97C1F552122855CB00EDE617 /* AtomicHTMLToken.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AtomicHTMLToken.h; sourceTree = "<group>"; };
-               97C471D912F925BC0086354B /* ContentSecurityPolicy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContentSecurityPolicy.cpp; sourceTree = "<group>"; };
-               97C471DA12F925BD0086354B /* ContentSecurityPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContentSecurityPolicy.h; sourceTree = "<group>"; };
+               97C471D912F925BC0086354B /* ContentSecurityPolicy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ContentSecurityPolicy.cpp; path = csp/ContentSecurityPolicy.cpp; sourceTree = "<group>"; };
+               97C471DA12F925BD0086354B /* ContentSecurityPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ContentSecurityPolicy.h; path = csp/ContentSecurityPolicy.h; sourceTree = "<group>"; };
                97D2AD0114B823A60093DF32 /* DOMWindowProperty.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMWindowProperty.cpp; sourceTree = "<group>"; };
                97D2AD0214B823A60093DF32 /* DOMWindowProperty.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMWindowProperty.h; sourceTree = "<group>"; };
                97DCE1FF10807C750057D394 /* HistoryController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HistoryController.cpp; sourceTree = "<group>"; };
                        children = (
                                316FE1060E6E1D8400BF6088 /* animation */,
                                5D5975B5196362BE00D00878 /* cocoa */,
+                               CE17AD141C58522F005F4799 /* csp */,
                                18A6CD6F0D8F2025001DC3CE /* ios */,
                                93C09A820B064F05005ABD4D /* mac */,
                                1AF62EE114DA22A70041556C /* scrolling */,
                                14D8238A0AF92DF60004F057 /* Chrome.cpp */,
                                14D823500AF92A790004F057 /* Chrome.h */,
                                14D824060AF93AEB0004F057 /* ChromeClient.h */,
-                               97C471D912F925BC0086354B /* ContentSecurityPolicy.cpp */,
-                               97C471DA12F925BD0086354B /* ContentSecurityPolicy.h */,
                                065AD4F20B0C2EDA005A2B1D /* ContextMenuClient.h */,
                                5106D7BB18BDB76F000AB166 /* ContextMenuContext.cpp */,
                                5106D7BC18BDB76F000AB166 /* ContextMenuContext.h */,
                        path = mediasource;
                        sourceTree = "<group>";
                };
+               CE17AD141C58522F005F4799 /* csp */ = {
+                       isa = PBXGroup;
+                       children = (
+                               97C471D912F925BC0086354B /* ContentSecurityPolicy.cpp */,
+                               97C471DA12F925BD0086354B /* ContentSecurityPolicy.h */,
+                       );
+                       name = csp;
+                       sourceTree = "<group>";
+               };
                CE261694187E6469007955F3 /* ios */ = {
                        isa = PBXGroup;
                        children = (
index f63ff31..003bc5d 100644 (file)
@@ -99,6 +99,7 @@ set(WebKit2_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/loader/cache"
     "${WEBCORE_DIR}/page"
     "${WEBCORE_DIR}/page/animation"
+    "${WEBCORE_DIR}/page/csp"
     "${WEBCORE_DIR}/page/scrolling"
     "${WEBCORE_DIR}/platform"
     "${WEBCORE_DIR}/platform/animation"
index 2151e77..acf3daf 100644 (file)
@@ -1,3 +1,15 @@
+2016-01-27  Daniel Bates  <dabates@apple.com>
+
+        Move ContentSecurityPolicy.{cpp, h} to its own directory
+        https://bugs.webkit.org/show_bug.cgi?id=153527
+        <rdar://problem/24359892>
+
+        Reviewed by Sam Weinig.
+
+        Add ${WEBCORE_DIR}/page/csp to the list of WebKit2 include directories.
+
+        * CMakeLists.txt:
+
 2016-01-27  Anders Carlsson  <andersca@apple.com>
 
         Add WebKitAdditions extension points to WebCore, WebKit and WebKitLegacy