Commit a5e72936 authored by andersca@apple.com's avatar andersca@apple.com

Add empty UserContentController class

https://bugs.webkit.org/show_bug.cgi?id=127300
<rdar://problem/15861296>

Reviewed by Dan Bernstein.

This is the first step towards moving handling of user scripts and style sheets from
the page group to a separate objects and ultimately make them be settable per page instead of per page group.

* CMakeLists.txt:
* GNUmakefile.list.am:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* page/UserContentController.cpp: Added.
(WebCore::UserContentController::create):
(WebCore::UserContentController::UserContentController):
(WebCore::UserContentController::~UserContentController):
* page/UserContentController.h: Added.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@162372 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 8fdbf242
......@@ -1773,6 +1773,7 @@ set(WebCore_SOURCES
page/SpeechInputResult.cpp
page/SpeechInputResultList.cpp
page/SuspendableTimer.cpp
page/UserContentController.cpp
page/UserContentURLPattern.cpp
page/WindowFeatures.cpp
page/WindowFocusAllowedIndicator.cpp
......
2014-01-20 Anders Carlsson <andersca@apple.com>
Add empty UserContentController class
https://bugs.webkit.org/show_bug.cgi?id=127300
<rdar://problem/15861296>
Reviewed by Dan Bernstein.
This is the first step towards moving handling of user scripts and style sheets from
the page group to a separate objects and ultimately make them be settable per page instead of per page group.
* CMakeLists.txt:
* GNUmakefile.list.am:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* page/UserContentController.cpp: Added.
(WebCore::UserContentController::create):
(WebCore::UserContentController::UserContentController):
(WebCore::UserContentController::~UserContentController):
* page/UserContentController.h: Added.
2014-01-20 Joseph Pecoraro <pecoraro@apple.com>
Run clang-modernize and let it add a bunch of missing overrides in WebCore/inspector
......@@ -4231,6 +4231,8 @@ webcore_sources += \
Source/WebCore/page/SpeechInputResultList.h \
Source/WebCore/page/SuspendableTimer.cpp \
Source/WebCore/page/SuspendableTimer.h \
Source/WebCore/page/UserContentController.cpp \
Source/WebCore/page/UserContentController.h \
Source/WebCore/page/UserContentTypes.h \
Source/WebCore/page/UserContentURLPattern.cpp \
Source/WebCore/page/UserContentURLPattern.h \
......
......@@ -7069,6 +7069,7 @@
<ClCompile Include="..\page\SpatialNavigation.cpp" />
<ClCompile Include="..\page\SpeechInput.cpp" />
<ClCompile Include="..\page\SuspendableTimer.cpp" />
<ClCompile Include="..\page\UserContentController.cpp" />
<ClCompile Include="..\page\UserContentURLPattern.cpp" />
<ClCompile Include="..\fileapi\WebKitBlobBuilder.cpp" />
<ClCompile Include="..\page\WindowFeatures.cpp" />
......@@ -18930,6 +18931,7 @@
<ClInclude Include="..\page\SpeechInputClient.h" />
<ClInclude Include="..\page\SpeechInputListener.h" />
<ClInclude Include="..\page\SuspendableTimer.h" />
<ClInclude Include="..\page\UserContentController.h" />
<ClInclude Include="..\page\UserContentURLPattern.h" />
<ClInclude Include="..\page\UserScript.h" />
<ClInclude Include="..\page\UserScriptTypes.h" />
......@@ -783,6 +783,9 @@
<ClCompile Include="..\page\SuspendableTimer.cpp">
<Filter>page</Filter>
</ClCompile>
<ClCompile Include="..\page\UserContentController.cpp">
<Filter>page</Filter>
</ClCompile>
<ClCompile Include="..\page\UserContentURLPattern.cpp">
<Filter>page</Filter>
</ClCompile>
......@@ -7697,6 +7700,9 @@
<ClInclude Include="..\page\SuspendableTimer.h">
<Filter>page</Filter>
</ClInclude>
<ClInclude Include="..\page\UserContentController.h">
<Filter>page</Filter>
</ClInclude>
<ClInclude Include="..\page\UserContentURLPattern.h">
<Filter>page</Filter>
</ClInclude>
......
......@@ -860,6 +860,8 @@
1AE2AE5C0A1D26F200B42B25 /* JSHTMLMenuElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE2AE5A0A1D26F200B42B25 /* JSHTMLMenuElement.h */; };
1AE2AEC70A1D297B00B42B25 /* JSHTMLQuoteElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE2AEC30A1D297B00B42B25 /* JSHTMLQuoteElement.cpp */; };
1AE2AEC80A1D297B00B42B25 /* JSHTMLQuoteElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE2AEC40A1D297B00B42B25 /* JSHTMLQuoteElement.h */; };
1AE79D42188DB61F002239C2 /* UserContentController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE79D40188DB61F002239C2 /* UserContentController.cpp */; };
1AE79D43188DB61F002239C2 /* UserContentController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE79D41188DB61F002239C2 /* UserContentController.h */; };
1AE82F8F0CAAFA9D002237AE /* JSDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE82F8D0CAAFA9D002237AE /* JSDatabase.cpp */; };
1AE82F900CAAFA9D002237AE /* JSDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE82F8E0CAAFA9D002237AE /* JSDatabase.h */; };
1AE82FEC0CAB07EE002237AE /* JSSQLResultSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE82FEA0CAB07EE002237AE /* JSSQLResultSet.cpp */; };
......@@ -7711,6 +7713,8 @@
1AE2AEA30A1D28E800B42B25 /* HTMLQuoteElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLQuoteElement.idl; sourceTree = "<group>"; };
1AE2AEC30A1D297B00B42B25 /* JSHTMLQuoteElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLQuoteElement.cpp; sourceTree = "<group>"; };
1AE2AEC40A1D297B00B42B25 /* JSHTMLQuoteElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSHTMLQuoteElement.h; sourceTree = "<group>"; };
1AE79D40188DB61F002239C2 /* UserContentController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UserContentController.cpp; sourceTree = "<group>"; };
1AE79D41188DB61F002239C2 /* UserContentController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserContentController.h; sourceTree = "<group>"; };
1AE82F8D0CAAFA9D002237AE /* JSDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDatabase.cpp; sourceTree = "<group>"; };
1AE82F8E0CAAFA9D002237AE /* JSDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDatabase.h; sourceTree = "<group>"; };
1AE82FEA0CAB07EE002237AE /* JSSQLResultSet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSQLResultSet.cpp; sourceTree = "<group>"; };
......@@ -16296,6 +16300,8 @@
75415AFC12958D5E003AD669 /* SpeechInputResultList.idl */,
62C1217A11AB9E76003C462C /* SuspendableTimer.cpp */,
62C1217B11AB9E77003C462C /* SuspendableTimer.h */,
1AE79D40188DB61F002239C2 /* UserContentController.cpp */,
1AE79D41188DB61F002239C2 /* UserContentController.h */,
003F1FE911E6AB43008258D9 /* UserContentTypes.h */,
BCACF3BA1072921A00C0C8A3 /* UserContentURLPattern.cpp */,
BCACF3BB1072921A00C0C8A3 /* UserContentURLPattern.h */,
......@@ -25864,6 +25870,7 @@
0B90561C0F2578BF0095FF6A /* ThreadableLoaderClient.h in Headers */,
1A7E3C291710997300367935 /* ThreadableLoaderClientWrapper.h in Headers */,
97AABD1714FA09D5007457AE /* ThreadableWebSocketChannel.h in Headers */,
1AE79D43188DB61F002239C2 /* UserContentController.h in Headers */,
97AABD1914FA09D5007457AE /* ThreadableWebSocketChannelClientWrapper.h in Headers */,
51DF6D7E0B92A16D00C2DC85 /* ThreadCheck.h in Headers */,
E1FF57A30F01255B00891EBB /* ThreadGlobalData.h in Headers */,
......@@ -27970,6 +27977,7 @@
B2CB92460B5BD97B009BAA78 /* JSSVGElementInstanceList.cpp in Sources */,
8542A79A0AE5C94400DF58DF /* JSSVGElementWrapperFactory.cpp in Sources */,
B2FA3D680AB75A6F000E5AC4 /* JSSVGEllipseElement.cpp in Sources */,
1AE79D42188DB61F002239C2 /* UserContentController.cpp in Sources */,
B266CD4D0C3AEC6500EB08D2 /* JSSVGException.cpp in Sources */,
B2FA3D6A0AB75A6F000E5AC4 /* JSSVGFEBlendElement.cpp in Sources */,
B2FA3D6C0AB75A6F000E5AC4 /* JSSVGFEColorMatrixElement.cpp in Sources */,
/*
* Copyright (C) 2014 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "config.h"
#include "UserContentController.h"
namespace WebCore {
RefPtr<UserContentController> UserContentController::create()
{
return adoptRef(new UserContentController);
}
UserContentController::UserContentController()
{
}
UserContentController::~UserContentController()
{
}
} // namespace WebCore
/*
* Copyright (C) 2014 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef UserContentController_h
#define UserContentController_h
#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>
namespace WebCore {
class UserContentController : public RefCounted<UserContentController> {
public:
static RefPtr<UserContentController> create();
~UserContentController();
private:
UserContentController();
};
} // namespace WebCore
#endif // UserContentController_h
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment