Diff
Modified: trunk/Source/WebCore/ChangeLog (149863 => 149864)
--- trunk/Source/WebCore/ChangeLog 2013-05-10 08:45:02 UTC (rev 149863)
+++ trunk/Source/WebCore/ChangeLog 2013-05-10 11:12:41 UTC (rev 149864)
@@ -1,3 +1,33 @@
+2013-05-10 Anders Carlsson <[email protected]>
+
+ Stop including SecurityOrigin.h where unnecessary
+ https://bugs.webkit.org/show_bug.cgi?id=115897
+
+ Reviewed by Antti Koivisto.
+
+ Move rarely called functions out of line so headers don't have to include SecurityOrigin.h
+
+ * Modules/indexeddb/IDBFactoryBackendImpl.h:
+ * Modules/webdatabase/DatabaseBackendBase.cpp:
+ (WebCore::DatabaseBackendBase::databaseDebugName):
+ * Modules/webdatabase/DatabaseBackendBase.h:
+ (DatabaseBackendBase):
+ * Modules/webdatabase/DatabaseSync.h:
+ * bindings/js/JSDOMWindowCustom.h:
+ * html/parser/XSSAuditor.cpp:
+ * loader/ThreadableLoader.cpp:
+ (WebCore::ThreadableLoaderOptions::ThreadableLoaderOptions):
+ (WebCore::ThreadableLoaderOptions::~ThreadableLoaderOptions):
+ (WebCore::ThreadableLoader::create):
+ * loader/ThreadableLoader.h:
+ (ThreadableLoaderOptions):
+ * loader/WorkerThreadableLoader.cpp:
+ * workers/DedicatedWorkerContext.cpp:
+ * workers/DedicatedWorkerThread.cpp:
+ * workers/SharedWorkerContext.cpp:
+ * workers/WorkerThread.cpp:
+ * workers/WorkerThread.h:
+
2013-05-10 Carlos Garcia Campos <[email protected]>
Unreviewed. Fix GTK+ build after r149839.
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBFactoryBackendImpl.h (149863 => 149864)
--- trunk/Source/WebCore/Modules/indexeddb/IDBFactoryBackendImpl.h 2013-05-10 08:45:02 UTC (rev 149863)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBFactoryBackendImpl.h 2013-05-10 11:12:41 UTC (rev 149864)
@@ -28,6 +28,8 @@
#ifndef IDBFactoryBackendImpl_h
#define IDBFactoryBackendImpl_h
+#if ENABLE(INDEXED_DATABASE)
+
#include "IDBCallbacks.h"
#include "IDBDatabaseCallbacks.h"
#include "IDBFactoryBackendInterface.h"
@@ -38,8 +40,6 @@
#include <wtf/WeakPtr.h>
#include <wtf/text/StringHash.h>
-#if ENABLE(INDEXED_DATABASE)
-
namespace WebCore {
class DOMStringList;
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp (149863 => 149864)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp 2013-05-10 08:45:02 UTC (rev 149863)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp 2013-05-10 11:12:41 UTC (rev 149864)
@@ -201,6 +201,13 @@
return infoTableName;
}
+#if !LOG_DISABLED || !ERROR_DISABLED
+String DatabaseBackendBase::databaseDebugName() const
+{
+ return m_contextThreadSecurityOrigin->toString() + "::" + m_name;
+}
+#endif
+
DatabaseBackendBase::DatabaseBackendBase(PassRefPtr<DatabaseBackendContext> databaseContext, const String& name,
const String& expectedVersion, const String& displayName, unsigned long estimatedSize, DatabaseType databaseType)
: m_databaseContext(databaseContext)
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.h (149863 => 149864)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.h 2013-05-10 08:45:02 UTC (rev 149863)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.h 2013-05-10 11:12:41 UTC (rev 149864)
@@ -41,10 +41,6 @@
#include <wtf/ThreadSafeRefCounted.h>
#include <wtf/text/WTFString.h>
-#if !LOG_DISABLED || !ERROR_DISABLED
-#include "SecurityOrigin.h"
-#endif
-
namespace WebCore {
class DatabaseAuthorizer;
@@ -116,6 +112,10 @@
static const char* databaseInfoTableName();
+#if !LOG_DISABLED || !ERROR_DISABLED
+ String databaseDebugName() const;
+#endif
+
RefPtr<SecurityOrigin> m_contextThreadSecurityOrigin;
RefPtr<DatabaseBackendContext> m_databaseContext; // Associated with m_scriptExecutionContext.
@@ -127,10 +127,6 @@
DatabaseBase* m_frontend;
-#if !LOG_DISABLED || !ERROR_DISABLED
- String databaseDebugName() const { return m_contextThreadSecurityOrigin->toString() + "::" + m_name; }
-#endif
-
private:
DatabaseGuid m_guid;
bool m_opened;
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseSync.h (149863 => 149864)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseSync.h 2013-05-10 08:45:02 UTC (rev 149863)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseSync.h 2013-05-10 11:12:41 UTC (rev 149864)
@@ -39,16 +39,11 @@
#include <wtf/Forward.h>
#include <wtf/text/WTFString.h>
-#ifndef NDEBUG
-#include "SecurityOrigin.h"
-#endif
-
namespace WebCore {
class DatabaseCallback;
class SQLTransactionSync;
class SQLTransactionSyncCallback;
-class SecurityOrigin;
// Instances of this class should be created and used only on the worker's context thread.
class DatabaseSync : public DatabaseBase, public DatabaseBackendSync {
Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.h (149863 => 149864)
--- trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.h 2013-05-10 08:45:02 UTC (rev 149863)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.h 2013-05-10 11:12:41 UTC (rev 149864)
@@ -21,7 +21,6 @@
#include "JSDOMWindow.h"
#include "JSDOMWindowShell.h"
-#include "SecurityOrigin.h"
namespace WebCore {
Modified: trunk/Source/WebCore/html/parser/XSSAuditor.cpp (149863 => 149864)
--- trunk/Source/WebCore/html/parser/XSSAuditor.cpp 2013-05-10 08:45:02 UTC (rev 149863)
+++ trunk/Source/WebCore/html/parser/XSSAuditor.cpp 2013-05-10 11:12:41 UTC (rev 149864)
@@ -46,7 +46,6 @@
#include "InspectorValues.h"
#include "KURL.h"
#include "PingLoader.h"
-#include "SecurityOrigin.h"
#include "Settings.h"
#include "TextEncoding.h"
#include "TextResourceDecoder.h"
Modified: trunk/Source/WebCore/loader/ThreadableLoader.cpp (149863 => 149864)
--- trunk/Source/WebCore/loader/ThreadableLoader.cpp 2013-05-10 08:45:02 UTC (rev 149863)
+++ trunk/Source/WebCore/loader/ThreadableLoader.cpp 2013-05-10 11:12:41 UTC (rev 149864)
@@ -31,17 +31,28 @@
#include "config.h"
#include "ThreadableLoader.h"
-#include "ScriptExecutionContext.h"
#include "Document.h"
#include "DocumentThreadableLoader.h"
+#include "ScriptExecutionContext.h"
+#include "SecurityOrigin.h"
#include "WorkerContext.h"
#include "WorkerRunLoop.h"
#include "WorkerThreadableLoader.h"
namespace WebCore {
-PassRefPtr<ThreadableLoader> ThreadableLoader::create(ScriptExecutionContext* context, ThreadableLoaderClient* client, const ResourceRequest& request, const ThreadableLoaderOptions& options)
+ThreadableLoaderOptions::ThreadableLoaderOptions()
+ : preflightPolicy(ConsiderPreflight)
+ , crossOriginRequestPolicy(DenyCrossOriginRequests)
{
+}
+
+ThreadableLoaderOptions::~ThreadableLoaderOptions()
+{
+}
+
+PassRefPtr<ThreadableLoader> ThreadableLoader::create(ScriptExecutionContext* context, ThreadableLoaderClient* client, const ResourceRequest& request, const ThreadableLoaderOptions& options)
+{
ASSERT(client);
ASSERT(context);
Modified: trunk/Source/WebCore/loader/ThreadableLoader.h (149863 => 149864)
--- trunk/Source/WebCore/loader/ThreadableLoader.h 2013-05-10 08:45:02 UTC (rev 149863)
+++ trunk/Source/WebCore/loader/ThreadableLoader.h 2013-05-10 11:12:41 UTC (rev 149864)
@@ -32,7 +32,6 @@
#define ThreadableLoader_h
#include "ResourceLoaderOptions.h"
-#include "SecurityOrigin.h"
#include <wtf/Noncopyable.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
@@ -44,6 +43,7 @@
class ResourceRequest;
class ResourceResponse;
class ScriptExecutionContext;
+ class SecurityOrigin;
class ThreadableLoaderClient;
enum CrossOriginRequestPolicy {
@@ -59,7 +59,9 @@
};
struct ThreadableLoaderOptions : public ResourceLoaderOptions {
- ThreadableLoaderOptions() : preflightPolicy(ConsiderPreflight), crossOriginRequestPolicy(DenyCrossOriginRequests) { }
+ ThreadableLoaderOptions();
+ ~ThreadableLoaderOptions();
+
PreflightPolicy preflightPolicy; // If AccessControl is used, how to determine if a preflight is needed.
CrossOriginRequestPolicy crossOriginRequestPolicy;
RefPtr<SecurityOrigin> securityOrigin;
Modified: trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp (149863 => 149864)
--- trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp 2013-05-10 08:45:02 UTC (rev 149863)
+++ trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp 2013-05-10 11:12:41 UTC (rev 149864)
@@ -40,6 +40,7 @@
#include "ResourceError.h"
#include "ResourceRequest.h"
#include "ResourceResponse.h"
+#include "SecurityOrigin.h"
#include "ThreadableLoader.h"
#include "WorkerContext.h"
#include "WorkerLoaderProxy.h"
Modified: trunk/Source/WebCore/workers/DedicatedWorkerContext.cpp (149863 => 149864)
--- trunk/Source/WebCore/workers/DedicatedWorkerContext.cpp 2013-05-10 08:45:02 UTC (rev 149863)
+++ trunk/Source/WebCore/workers/DedicatedWorkerContext.cpp 2013-05-10 11:12:41 UTC (rev 149864)
@@ -37,6 +37,7 @@
#include "DedicatedWorkerThread.h"
#include "DOMWindow.h"
#include "MessageEvent.h"
+#include "SecurityOrigin.h"
#include "WorkerObjectProxy.h"
namespace WebCore {
Modified: trunk/Source/WebCore/workers/DedicatedWorkerThread.cpp (149863 => 149864)
--- trunk/Source/WebCore/workers/DedicatedWorkerThread.cpp 2013-05-10 08:45:02 UTC (rev 149863)
+++ trunk/Source/WebCore/workers/DedicatedWorkerThread.cpp 2013-05-10 11:12:41 UTC (rev 149864)
@@ -35,6 +35,7 @@
#include "DedicatedWorkerThread.h"
#include "DedicatedWorkerContext.h"
+#include "SecurityOrigin.h"
#include "WorkerObjectProxy.h"
namespace WebCore {
Modified: trunk/Source/WebCore/workers/SharedWorkerContext.cpp (149863 => 149864)
--- trunk/Source/WebCore/workers/SharedWorkerContext.cpp 2013-05-10 08:45:02 UTC (rev 149863)
+++ trunk/Source/WebCore/workers/SharedWorkerContext.cpp 2013-05-10 11:12:41 UTC (rev 149864)
@@ -39,6 +39,7 @@
#include "MessageEvent.h"
#include "NotImplemented.h"
#include "ScriptCallStack.h"
+#include "SecurityOrigin.h"
#include "SharedWorkerThread.h"
namespace WebCore {
Modified: trunk/Source/WebCore/workers/WorkerThread.cpp (149863 => 149864)
--- trunk/Source/WebCore/workers/WorkerThread.cpp 2013-05-10 08:45:02 UTC (rev 149863)
+++ trunk/Source/WebCore/workers/WorkerThread.cpp 2013-05-10 11:12:41 UTC (rev 149864)
@@ -35,8 +35,8 @@
#include "KURL.h"
#include "ScriptSourceCode.h"
#include "ScriptValue.h"
+#include "SecurityOrigin.h"
#include "ThreadGlobalData.h"
-
#include <utility>
#include <wtf/Noncopyable.h>
#include <wtf/text/WTFString.h>
Modified: trunk/Source/WebCore/workers/WorkerThread.h (149863 => 149864)
--- trunk/Source/WebCore/workers/WorkerThread.h 2013-05-10 08:45:02 UTC (rev 149863)
+++ trunk/Source/WebCore/workers/WorkerThread.h 2013-05-10 11:12:41 UTC (rev 149864)
@@ -31,7 +31,6 @@
#include "ContentSecurityPolicy.h"
#include "GroupSettings.h"
-#include "SecurityOrigin.h"
#include "WorkerRunLoop.h"
#include <wtf/Forward.h>
#include <wtf/OwnPtr.h>
@@ -42,6 +41,7 @@
class KURL;
class NotificationClient;
+ class SecurityOrigin;
class WorkerContext;
class WorkerLoaderProxy;
class WorkerReportingProxy;
