⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 201504 in webkit


Ignore:
Timestamp:
May 30, 2016, 8:35:44 PM (10 years ago)
Author:
beidson@apple.com
Message:

Move CrossThreadCopier/CrossThreadTask to WTF.
​https://bugs.webkit.org/show_bug.cgi?id=158207

Reviewed by Alex Christensen.

Source/WebCore:

No new tests (Refactor, no behavior change).

  • CMakeLists.txt:
  • WebCore.xcodeproj/project.pbxproj:
  • Modules/indexeddb/IDBActiveDOMObject.h:
  • Modules/indexeddb/IDBValue.cpp:
  • Modules/indexeddb/client/IDBConnectionProxy.h:
  • Modules/indexeddb/server/IDBServer.cpp:
  • Modules/indexeddb/server/IDBServer.h:
  • Modules/indexeddb/server/UniqueIDBDatabase.h:
  • dom/ScriptExecutionContext.h:
  • fileapi/ThreadableBlobRegistry.cpp:
  • platform/WebCoreCrossThreadCopier.cpp: Added.

(WTF::WebCore::SessionID>::copy):
(WTF::WebCore::ThreadSafeDataBuffer>::copy):

  • platform/WebCoreCrossThreadCopier.h: Added.
  • platform/network/cf/ResourceError.h:

(WebCore::ResourceError::isolatedCopy):

  • platform/network/cf/ResourceRequest.h:

(WebCore::ResourceRequest::isolatedCopy):

  • platform/network/cf/ResourceResponse.h:

(WebCore::ResourceResponse::isolatedCopy):

Source/WebKit2:

  • CMakeLists.txt:
  • WebKit2.xcodeproj/project.pbxproj:
  • DatabaseProcess/DatabaseProcess.cpp:
  • DatabaseProcess/DatabaseProcess.h:
  • Shared/WebCrossThreadCopier.cpp: Removed.
  • Shared/WebCrossThreadCopier.h: Removed.

Source/WTF:

  • WTF.xcodeproj/project.pbxproj:
  • wtf/CMakeLists.txt:
  • wtf/CrossThreadCopier.cpp: Renamed from Source/WebCore/platform/CrossThreadCopier.cpp.
  • wtf/CrossThreadCopier.h: Renamed from Source/WebCore/platform/CrossThreadCopier.h.

(WTF::CrossThreadCopierPassThrough::copy):

  • wtf/CrossThreadTask.h: Renamed from Source/WebCore/platform/CrossThreadTask.h.

(WTF::CrossThreadTask::CrossThreadTask):
(WTF::CrossThreadTask::performTask):
(WTF::createCrossThreadTask):

Location:
trunk/Source
Files:
2 added
2 deleted
22 edited
3 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r201493 r201504  
     12016-05-30  Brady Eidson  <beidson@apple.com>
     2
     3        Move CrossThreadCopier/CrossThreadTask to WTF.
     4        https://bugs.webkit.org/show_bug.cgi?id=158207
     5
     6        Reviewed by Alex Christensen.
     7
     8        * WTF.xcodeproj/project.pbxproj:
     9        * wtf/CMakeLists.txt:
     10
     11        * wtf/CrossThreadCopier.cpp: Renamed from Source/WebCore/platform/CrossThreadCopier.cpp.
     12        * wtf/CrossThreadCopier.h: Renamed from Source/WebCore/platform/CrossThreadCopier.h.
     13        (WTF::CrossThreadCopierPassThrough::copy):
     14       
     15        * wtf/CrossThreadTask.h: Renamed from Source/WebCore/platform/CrossThreadTask.h.
     16        (WTF::CrossThreadTask::CrossThreadTask):
     17        (WTF::CrossThreadTask::performTask):
     18        (WTF::createCrossThreadTask):
     19
    1202016-05-28  Chris Dumez  <cdumez@apple.com>
    221

  • trunk/Source/WTF/WTF.xcodeproj/project.pbxproj

    r201482 r201504  
    102102                430B47891AAAAC1A001223DA /* StringCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 430B47871AAAAC1A001223DA /* StringCommon.h */; };
    103103                513E170B1CD7D5BF00E3650B /* LoggingAccumulator.h in Headers */ = {isa = PBXBuildFile; fileRef = 513E170A1CD7D5BF00E3650B /* LoggingAccumulator.h */; };
     104                515F794E1CFC9F4A00CCED93 /* CrossThreadCopier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 515F794B1CFC9F4A00CCED93 /* CrossThreadCopier.cpp */; };
     105                515F794F1CFC9F4A00CCED93 /* CrossThreadCopier.h in Headers */ = {isa = PBXBuildFile; fileRef = 515F794C1CFC9F4A00CCED93 /* CrossThreadCopier.h */; };
     106                515F79501CFC9F4A00CCED93 /* CrossThreadTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 515F794D1CFC9F4A00CCED93 /* CrossThreadTask.h */; };
    104107                553071CA1C40427200384898 /* TinyLRUCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 553071C91C40427200384898 /* TinyLRUCache.h */; };
    105108                70A993FE1AD7151300FA615B /* SymbolRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 70A993FC1AD7151300FA615B /* SymbolRegistry.cpp */; };
    … …  
    421424                430B47871AAAAC1A001223DA /* StringCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringCommon.h; sourceTree = "<group>"; };
    422425                513E170A1CD7D5BF00E3650B /* LoggingAccumulator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoggingAccumulator.h; sourceTree = "<group>"; };
     426                515F794B1CFC9F4A00CCED93 /* CrossThreadCopier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CrossThreadCopier.cpp; sourceTree = "<group>"; };
     427                515F794C1CFC9F4A00CCED93 /* CrossThreadCopier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CrossThreadCopier.h; sourceTree = "<group>"; };
     428                515F794D1CFC9F4A00CCED93 /* CrossThreadTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CrossThreadTask.h; sourceTree = "<group>"; };
    423429                553071C91C40427200384898 /* TinyLRUCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TinyLRUCache.h; sourceTree = "<group>"; };
    424430                5D247B6214689B8600E78B76 /* libWTF.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libWTF.a; sourceTree = BUILT_PRODUCTS_DIR; };
    … …  
    798804                                A8A47270151A825A004123FF /* Compiler.h */,
    799805                                0FDB698D1B7C643A000C1078 /* Condition.h */,
     806                                515F794B1CFC9F4A00CCED93 /* CrossThreadCopier.cpp */,
     807                                515F794C1CFC9F4A00CCED93 /* CrossThreadCopier.h */,
     808                                515F794D1CFC9F4A00CCED93 /* CrossThreadTask.h */,
    800809                                A8A47273151A825A004123FF /* CryptographicallyRandomNumber.cpp */,
    801810                                A8A47274151A825A004123FF /* CryptographicallyRandomNumber.h */,
    … …  
    12481257                                A8A473E3151A825B004123FF /* Locker.h in Headers */,
    12491258                                A8A473E6151A825B004123FF /* MainThread.h in Headers */,
     1259                                515F794F1CFC9F4A00CCED93 /* CrossThreadCopier.h in Headers */,
    12501260                                1A233C7D17DAA6E300A93ACF /* MallocPtr.h in Headers */,
    12511261                                A8A473E8151A825B004123FF /* MathExtras.h in Headers */,
    … …  
    12951305                                A8A4741C151A825B004123FF /* RefPtr.h in Headers */,
    12961306                                A8A4741E151A825B004123FF /* RetainPtr.h in Headers */,
     1307                                515F79501CFC9F4A00CCED93 /* CrossThreadTask.h in Headers */,
    12971308                                2CDED0F418115C85004DBA70 /* RunLoop.h in Headers */,
    12981309                                1469419216EAAF6D0024E146 /* RunLoopTimer.h in Headers */,
    … …  
    15221533                                A8A47425151A825B004123FF /* SizeLimits.cpp in Sources */,
    15231534                                A8A47427151A825B004123FF /* StackBounds.cpp in Sources */,
     1535                                515F794E1CFC9F4A00CCED93 /* CrossThreadCopier.cpp in Sources */,
    15241536                                FEDACD3D1630F83F00C69634 /* StackStats.cpp in Sources */,
    15251537                                A8A4743C151A825B004123FF /* StringBuilder.cpp in Sources */,

  • trunk/Source/WTF/wtf/CMakeLists.txt

    r201406 r201504  
    1414    Compiler.h
    1515    Condition.h
     16    CrossThreadCopier.h
     17    CrossThreadTask.h
    1618    CryptographicUtilities.h
    1719    CryptographicallyRandomNumber.h
    … …  
    160162    BitVector.cpp
    161163    CompilationThread.cpp
     164    CrossThreadCopier.cpp
    162165    CryptographicUtilities.cpp
    163166    CryptographicallyRandomNumber.cpp

  • trunk/Source/WTF/wtf/CrossThreadCopier.cpp

    r201503 r201504  
    11/*
    22 * Copyright (C) 2009 Google Inc. All rights reserved.
     3 * Copyright (C) 2011-2016 Apple Inc. All rights reserved.
    34 *
    45 * Redistribution and use in source and binary forms, with or without
    … …  
    3031
    3132#include "config.h"
    32 
    3333#include "CrossThreadCopier.h"
    3434
    35 #include "URL.h"
    36 #include "ResourceError.h"
    37 #include "ResourceRequest.h"
    38 #include "ResourceResponse.h"
    39 #include "SecurityOriginData.h"
    40 #include "SerializedScriptValue.h"
    41 #include "SessionID.h"
    42 #include "ThreadSafeDataBuffer.h"
    43 #include <wtf/Assertions.h>
    44 #include <wtf/text/WTFString.h>
    45 
    46 namespace WebCore {
    47 
    48 CrossThreadCopierBase<false, false, URL>::Type CrossThreadCopierBase<false, false, URL>::copy(const URL& url)
    49 {
    50     return url.isolatedCopy();
    51 }
    52 
    53 CrossThreadCopierBase<false, false, String>::Type CrossThreadCopierBase<false, false, String>::copy(const String& str)
    54 {
    55     return str.isolatedCopy();
    56 }
    57 
    58 CrossThreadCopierBase<false, false, ResourceError>::Type CrossThreadCopierBase<false, false, ResourceError>::copy(const ResourceError& error)
    59 {
    60     return error.copy();
    61 }
    62 
    63 CrossThreadCopierBase<false, false, ResourceRequest>::Type CrossThreadCopierBase<false, false, ResourceRequest>::copy(const ResourceRequest& request)
    64 {
    65     return request.copyData();
    66 }
    67 
    68 CrossThreadCopierBase<false, false, ResourceResponse>::Type CrossThreadCopierBase<false, false, ResourceResponse>::copy(const ResourceResponse& response)
    69 {
    70     return response.copyData();
    71 }
    72 
    73 CrossThreadCopierBase<false, false, SecurityOriginData>::Type CrossThreadCopierBase<false, false, SecurityOriginData>::copy(const SecurityOriginData& originData)
    74 {
    75     return originData.isolatedCopy();
    76 }
    77 
    78 CrossThreadCopierBase<false, false, SessionID>::Type CrossThreadCopierBase<false, false, SessionID>::copy(const SessionID& sessionID)
    79 {
    80     return sessionID;
    81 }
    82 
    83 CrossThreadCopierBase<false, false, ThreadSafeDataBuffer>::Type CrossThreadCopierBase<false, false, ThreadSafeDataBuffer>::copy(const ThreadSafeDataBuffer& buffer)
    84 {
    85     return ThreadSafeDataBuffer(buffer);
    86 }
    87 
    88 CrossThreadCopierBase<false, false, std::chrono::system_clock::time_point>::Type CrossThreadCopierBase<false, false, std::chrono::system_clock::time_point>::copy(const std::chrono::system_clock::time_point& timePoint)
    89 {
    90     return timePoint;
    91 }
     35namespace WTF {
    9236
    9337// Test CrossThreadCopier using COMPILE_ASSERT.
    … …  
    9842
    9943COMPILE_ASSERT((std::is_same<
    100                   PassRefPtr<CopierThreadSafeRefCountedTest>,
    101                   CrossThreadCopier<PassRefPtr<CopierThreadSafeRefCountedTest>>::Type
    102                   >::value),
    103                PassRefPtrTest);
     44                    PassRefPtr<CopierThreadSafeRefCountedTest>,
     45                    CrossThreadCopier<PassRefPtr<CopierThreadSafeRefCountedTest>>::Type
     46                >::value),
     47                PassRefPtrTest);
    10448COMPILE_ASSERT((std::is_same<
    105                   PassRefPtr<CopierThreadSafeRefCountedTest>,
    106                   CrossThreadCopier<RefPtr<CopierThreadSafeRefCountedTest>>::Type
    107                   >::value),
    108                RefPtrTest);
     49                    PassRefPtr<CopierThreadSafeRefCountedTest>,
     50                    CrossThreadCopier<RefPtr<CopierThreadSafeRefCountedTest>>::Type
     51                >::value),
     52                RefPtrTest);
    10953COMPILE_ASSERT((std::is_same<
    110                   PassRefPtr<CopierThreadSafeRefCountedTest>,
    111                   CrossThreadCopier<CopierThreadSafeRefCountedTest*>::Type
    112                   >::value),
    113                RawPointerTest);
     54                    PassRefPtr<CopierThreadSafeRefCountedTest>,
     55                    CrossThreadCopier<CopierThreadSafeRefCountedTest*>::Type
     56                >::value),
     57                RawPointerTest);
    11458
    11559// Add specializations for RefCounted types which will let us verify that no other template matches.
    … …  
    13478static_assert((std::is_same<int, CrossThreadCopier<CopierRefCountedTest*>::Type>::value), "CrossThreadCopier specialization improperly applied to raw pointer of a RefCounted (but not ThreadSafeRefCounted) type");
    13579
    136 } // namespace WebCore
     80} // namespace WTF

  • trunk/Source/WTF/wtf/CrossThreadCopier.h

    r201503 r201504  
    3939#include <wtf/text/WTFString.h>
    4040
    41 namespace WebCore {
    42 
    43 class IntRect;
    44 class IntSize;
    45 class URL;
    46 class ResourceError;
    47 class ResourceRequest;
    48 class ResourceResponse;
    49 class SessionID;
    50 class ThreadSafeDataBuffer;
    51 struct CrossThreadResourceResponseData;
    52 struct CrossThreadResourceRequestData;
    53 struct SecurityOriginData;
    54 struct ThreadableLoaderOptions;
     41namespace WTF {
    5542
    5643struct CrossThreadCopierBaseHelper {
    … …  
    9380};
    9481
    95 // To allow a type to be passed across threads using its copy constructor, add a forward declaration of the type and
    96 // a CopyThreadCopierBase<false, false, TypeName> : public CrossThreadCopierPassThrough<TypeName> { }; to this file.
    97 template<> struct CrossThreadCopierBase<false, false, IntRect> : public CrossThreadCopierPassThrough<IntRect> {
    98 };
    99 
    100 template<> struct CrossThreadCopierBase<false, false, IntSize> : public CrossThreadCopierPassThrough<IntSize> {
    101 };
    102 
    10382// Classes that have an isolatedCopy() method get a default specialization.
    10483template<class T> struct CrossThreadCopierBase<false, false, T> {
    … …  
    11594
    11695    typedef PassRefPtr<RefCountedType> Type;
    117     WEBCORE_EXPORT static Type copy(const T& refPtr)
     96    static Type copy(const T& refPtr)
    11897    {
    11998        return refPtr;
    … …  
    121100};
    122101
    123 template<> struct CrossThreadCopierBase<false, false, URL> {
    124     typedef URL Type;
    125     static Type copy(const URL&);
     102template<> struct CrossThreadCopierBase<false, false, std::chrono::system_clock::time_point> {
     103    typedef std::chrono::system_clock::time_point Type;
     104    static Type copy(const Type& source)
     105    {
     106        return source;
     107    }
    126108};
    127109
    128 template<> struct WEBCORE_EXPORT CrossThreadCopierBase<false, false, String> {
    129     typedef String Type;
    130     static Type copy(const String&);
    131 };
    132 
    133 template<> struct CrossThreadCopierBase<false, false, ResourceError> {
    134     typedef ResourceError Type;
    135     static Type copy(const ResourceError&);
    136 };
    137 
    138 template<> struct CrossThreadCopierBase<false, false, ResourceRequest> {
    139     typedef std::unique_ptr<CrossThreadResourceRequestData> Type;
    140     static Type copy(const ResourceRequest&);
    141 };
    142 
    143 template<> struct CrossThreadCopierBase<false, false, ResourceResponse> {
    144     typedef std::unique_ptr<CrossThreadResourceResponseData> Type;
    145     static Type copy(const ResourceResponse&);
    146 };
    147 
    148 template<> struct CrossThreadCopierBase<false, false, SecurityOriginData> {
    149     typedef SecurityOriginData Type;
    150     static Type copy(const SecurityOriginData&);
    151 };
    152 
    153 template<> struct CrossThreadCopierBase<false, false, SessionID> {
    154     typedef SessionID Type;
    155     static Type copy(const SessionID&);
    156 };
    157 
    158 template<> struct CrossThreadCopierBase<false, false, ThreadSafeDataBuffer> {
    159     typedef ThreadSafeDataBuffer Type;
    160     static Type copy(const ThreadSafeDataBuffer&);
    161 };
    162 
    163 template<> struct CrossThreadCopierBase<false, false, std::chrono::system_clock::time_point> {
    164     typedef std::chrono::system_clock::time_point Type;
    165     static Type copy(const Type& source);
     110template<> struct CrossThreadCopierBase<false, false, WTF::ASCIILiteral> {
     111    typedef WTF::ASCIILiteral Type;
     112    static Type copy(const Type& source)
     113    {
     114        return source;
     115    }
    166116};
    167117
    … …  
    183133};
    184134
    185 } // namespace WebCore
     135} // namespace WTF
     136
     137using WTF::CrossThreadCopierBaseHelper;
     138using WTF::CrossThreadCopierBase;
     139using WTF::CrossThreadCopier;

  • trunk/Source/WTF/wtf/CrossThreadTask.h

    r201503 r201504  
    11/*
    2  * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
     2 * Copyright (C) 2013, 2015, 2016 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
    26 #ifndef CrossThreadTask_h
    27 #define CrossThreadTask_h
    28 
    29 #include "CrossThreadCopier.h"
    30 #include <functional>
    31 
    32 namespace WebCore {
     26#pragma once
     27
     28#include <wtf/CrossThreadCopier.h>
     29#include <wtf/NoncopyableFunction.h>
     30
     31namespace WTF {
    3332
    3433class CrossThreadTask {
    3534    WTF_MAKE_NONCOPYABLE(CrossThreadTask);
    3635public:
    37     CrossThreadTask(const std::function<void ()> taskFunction)
    38         : m_taskFunction(taskFunction)
     36    CrossThreadTask(NoncopyableFunction<void ()>&& taskFunction)
     37        : m_taskFunction(WTFMove(taskFunction))
    3938    {
    4039        ASSERT(taskFunction);
    … …  
    4948    CrossThreadTask() { }
    5049
    51     std::function<void ()> m_taskFunction;
     50    NoncopyableFunction<void ()> m_taskFunction;
    5251};
    5352
    … …  
    9190        &callee,
    9291        method,
    93         WebCore::CrossThreadCopier<P1>::copy(parameter1));
     92        WTF::CrossThreadCopier<P1>::copy(parameter1));
    9493}
    9594
    … …  
    104103        &callee,
    105104        method,
    106         WebCore::CrossThreadCopier<P1>::copy(parameter1),
    107         WebCore::CrossThreadCopier<P2>::copy(parameter2));
     105        WTF::CrossThreadCopier<P1>::copy(parameter1),
     106        WTF::CrossThreadCopier<P2>::copy(parameter2));
    108107
    109108}
    … …  
    120119        &callee,
    121120        method,
    122         WebCore::CrossThreadCopier<P1>::copy(parameter1),
    123         WebCore::CrossThreadCopier<P2>::copy(parameter2),
    124         WebCore::CrossThreadCopier<P3>::copy(parameter3));
     121        WTF::CrossThreadCopier<P1>::copy(parameter1),
     122        WTF::CrossThreadCopier<P2>::copy(parameter2),
     123        WTF::CrossThreadCopier<P3>::copy(parameter3));
    125124}
    126125
    … …  
    134133    return std::make_unique<CrossThreadTaskStaticImpl<MP1, MP2, MP3>>(
    135134        method,
    136         WebCore::CrossThreadCopier<P1>::copy(parameter1),
    137         WebCore::CrossThreadCopier<P2>::copy(parameter2),
    138         WebCore::CrossThreadCopier<P3>::copy(parameter3));
     135        WTF::CrossThreadCopier<P1>::copy(parameter1),
     136        WTF::CrossThreadCopier<P2>::copy(parameter2),
     137        WTF::CrossThreadCopier<P3>::copy(parameter3));
    139138}
    140139
    … …  
    151150        &callee,
    152151        method,
    153         WebCore::CrossThreadCopier<P1>::copy(parameter1),
    154         WebCore::CrossThreadCopier<P2>::copy(parameter2),
    155         WebCore::CrossThreadCopier<P3>::copy(parameter3),
    156         WebCore::CrossThreadCopier<P4>::copy(parameter4));
     152        WTF::CrossThreadCopier<P1>::copy(parameter1),
     153        WTF::CrossThreadCopier<P2>::copy(parameter2),
     154        WTF::CrossThreadCopier<P3>::copy(parameter3),
     155        WTF::CrossThreadCopier<P4>::copy(parameter4));
    157156}
    158157
    … …  
    170169        &callee,
    171170        method,
    172         WebCore::CrossThreadCopier<P1>::copy(parameter1),
    173         WebCore::CrossThreadCopier<P2>::copy(parameter2),
    174         WebCore::CrossThreadCopier<P3>::copy(parameter3),
    175         WebCore::CrossThreadCopier<P4>::copy(parameter4),
    176         WebCore::CrossThreadCopier<P5>::copy(parameter5));
     171        WTF::CrossThreadCopier<P1>::copy(parameter1),
     172        WTF::CrossThreadCopier<P2>::copy(parameter2),
     173        WTF::CrossThreadCopier<P3>::copy(parameter3),
     174        WTF::CrossThreadCopier<P4>::copy(parameter4),
     175        WTF::CrossThreadCopier<P5>::copy(parameter5));
    177176}
    178177
    … …  
    191190        &callee,
    192191        method,
    193         WebCore::CrossThreadCopier<P1>::copy(parameter1),
    194         WebCore::CrossThreadCopier<P2>::copy(parameter2),
    195         WebCore::CrossThreadCopier<P3>::copy(parameter3),
    196         WebCore::CrossThreadCopier<P4>::copy(parameter4),
    197         WebCore::CrossThreadCopier<P5>::copy(parameter5),
    198         WebCore::CrossThreadCopier<P6>::copy(parameter6));
     192        WTF::CrossThreadCopier<P1>::copy(parameter1),
     193        WTF::CrossThreadCopier<P2>::copy(parameter2),
     194        WTF::CrossThreadCopier<P3>::copy(parameter3),
     195        WTF::CrossThreadCopier<P4>::copy(parameter4),
     196        WTF::CrossThreadCopier<P5>::copy(parameter5),
     197        WTF::CrossThreadCopier<P6>::copy(parameter6));
    199198}
    200199
    … …  
    214213        &callee,
    215214        method,
    216         WebCore::CrossThreadCopier<P1>::copy(parameter1),
    217         WebCore::CrossThreadCopier<P2>::copy(parameter2),
    218         WebCore::CrossThreadCopier<P3>::copy(parameter3),
    219         WebCore::CrossThreadCopier<P4>::copy(parameter4),
    220         WebCore::CrossThreadCopier<P5>::copy(parameter5),
    221         WebCore::CrossThreadCopier<P6>::copy(parameter6),
    222         WebCore::CrossThreadCopier<P7>::copy(parameter7));
     215        WTF::CrossThreadCopier<P1>::copy(parameter1),
     216        WTF::CrossThreadCopier<P2>::copy(parameter2),
     217        WTF::CrossThreadCopier<P3>::copy(parameter3),
     218        WTF::CrossThreadCopier<P4>::copy(parameter4),
     219        WTF::CrossThreadCopier<P5>::copy(parameter5),
     220        WTF::CrossThreadCopier<P6>::copy(parameter6),
     221        WTF::CrossThreadCopier<P7>::copy(parameter7));
    223222}
    224223
    … …  
    239238        &callee,
    240239        method,
    241         WebCore::CrossThreadCopier<P1>::copy(parameter1),
    242         WebCore::CrossThreadCopier<P2>::copy(parameter2),
    243         WebCore::CrossThreadCopier<P3>::copy(parameter3),
    244         WebCore::CrossThreadCopier<P4>::copy(parameter4),
    245         WebCore::CrossThreadCopier<P5>::copy(parameter5),
    246         WebCore::CrossThreadCopier<P6>::copy(parameter6),
    247         WebCore::CrossThreadCopier<P7>::copy(parameter7),
    248         WebCore::CrossThreadCopier<P8>::copy(parameter8));
    249 }
    250 
    251 } // namespace WebCore
    252 
    253 #endif // CrossThreadTask_h
     240        WTF::CrossThreadCopier<P1>::copy(parameter1),
     241        WTF::CrossThreadCopier<P2>::copy(parameter2),
     242        WTF::CrossThreadCopier<P3>::copy(parameter3),
     243        WTF::CrossThreadCopier<P4>::copy(parameter4),
     244        WTF::CrossThreadCopier<P5>::copy(parameter5),
     245        WTF::CrossThreadCopier<P6>::copy(parameter6),
     246        WTF::CrossThreadCopier<P7>::copy(parameter7),
     247        WTF::CrossThreadCopier<P8>::copy(parameter8));
     248}
     249
     250} // namespace WTF
     251
     252using WTF::CrossThreadTask;
     253using WTF::createCrossThreadTask;

  • trunk/Source/WebCore/CMakeLists.txt

    r201422 r201504  
    20982098    platform/ContextMenu.cpp
    20992099    platform/ContextMenuItem.cpp
    2100     platform/CrossThreadCopier.cpp
    21012100    platform/Cursor.cpp
    21022101    platform/DateComponents.cpp
    … …  
    21432142    platform/UUID.cpp
    21442143    platform/UserActivity.cpp
     2144    platform/WebCoreCrossThreadCopier.cpp
    21452145    platform/Widget.cpp
    21462146

  • trunk/Source/WebCore/ChangeLog

    r201500 r201504  
     12016-05-30  Brady Eidson  <beidson@apple.com>
     2
     3        Move CrossThreadCopier/CrossThreadTask to WTF.
     4        https://bugs.webkit.org/show_bug.cgi?id=158207
     5
     6        Reviewed by Alex Christensen.
     7
     8        No new tests (Refactor, no behavior change).
     9
     10        * CMakeLists.txt:
     11        * WebCore.xcodeproj/project.pbxproj:
     12
     13        * Modules/indexeddb/IDBActiveDOMObject.h:
     14        * Modules/indexeddb/IDBValue.cpp:
     15        * Modules/indexeddb/client/IDBConnectionProxy.h:
     16        * Modules/indexeddb/server/IDBServer.cpp:
     17        * Modules/indexeddb/server/IDBServer.h:
     18        * Modules/indexeddb/server/UniqueIDBDatabase.h:
     19        * dom/ScriptExecutionContext.h:
     20        * fileapi/ThreadableBlobRegistry.cpp:
     21       
     22        * platform/WebCoreCrossThreadCopier.cpp: Added.
     23        (WTF::WebCore::SessionID>::copy):
     24        (WTF::WebCore::ThreadSafeDataBuffer>::copy):
     25        * platform/WebCoreCrossThreadCopier.h: Added.
     26       
     27        * platform/network/cf/ResourceError.h:
     28        (WebCore::ResourceError::isolatedCopy):
     29       
     30        * platform/network/cf/ResourceRequest.h:
     31        (WebCore::ResourceRequest::isolatedCopy):
     32       
     33        * platform/network/cf/ResourceResponse.h:
     34        (WebCore::ResourceResponse::isolatedCopy):
     35
    1362016-05-30  Per Arne Vollan  <pvollan@apple.com>
    237

  • trunk/Source/WebCore/Modules/indexeddb/IDBActiveDOMObject.h

    r201356 r201504  
    2727
    2828#include "ActiveDOMObject.h"
    29 #include "CrossThreadCopier.h"
    3029#include "ScriptExecutionContext.h"
     30#include <wtf/CrossThreadTask.h>
    3131#include <wtf/MainThread.h>
    3232#include <wtf/Threading.h>

  • trunk/Source/WebCore/Modules/indexeddb/IDBValue.cpp

    r201232 r201504  
    2929#if ENABLE(INDEXED_DATABASE)
    3030
    31 #include "CrossThreadCopier.h"
    3231#include "SerializedScriptValue.h"
     32#include <wtf/CrossThreadTask.h>
    3333
    3434namespace WebCore {

  • trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h

    r201390 r201504  
    2828#if ENABLE(INDEXED_DATABASE)
    2929
    30 #include "CrossThreadTask.h"
    3130#include "IDBConnectionToServer.h"
    3231#include "IDBResourceIdentifier.h"
    3332#include "TransactionOperation.h"
    3433#include <functional>
     34#include <wtf/CrossThreadTask.h>
    3535#include <wtf/HashMap.h>
    3636#include <wtf/MainThread.h>

  • trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp

    r201195 r201504  
    2929#if ENABLE(INDEXED_DATABASE)
    3030
    31 #include "CrossThreadCopier.h"
    3231#include "IDBRequestData.h"
    3332#include "IDBResultData.h"
    … …  
    3736#include "SQLiteIDBBackingStore.h"
    3837#include "SecurityOrigin.h"
     38#include <wtf/CrossThreadCopier.h>
    3939#include <wtf/Locker.h>
    4040#include <wtf/MainThread.h>

  • trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h

    r201098 r201504  
    2828#if ENABLE(INDEXED_DATABASE)
    2929
    30 #include "CrossThreadTask.h"
    3130#include "IDBConnectionToClient.h"
    3231#include "IDBDatabaseIdentifier.h"
    3332#include "UniqueIDBDatabase.h"
    3433#include "UniqueIDBDatabaseConnection.h"
     34#include <wtf/CrossThreadTask.h>
    3535#include <wtf/HashMap.h>
    3636#include <wtf/Lock.h>
    … …  
    4242namespace WebCore {
    4343
    44 class CrossThreadTask;
    4544class IDBCursorInfo;
    4645class IDBRequestData;

  • trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h

    r201195 r201504  
    2828#if ENABLE(INDEXED_DATABASE)
    2929
    30 #include "CrossThreadTask.h"
    3130#include "IDBBackingStore.h"
    3231#include "IDBBindingUtilities.h"
    … …  
    3938#include "UniqueIDBDatabaseConnection.h"
    4039#include "UniqueIDBDatabaseTransaction.h"
     40#include <wtf/CrossThreadTask.h>
    4141#include <wtf/Deque.h>
    4242#include <wtf/HashCountedSet.h>

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r201422 r201504  
    12521252                2E4346540F546A8200B0F1BA /* WorkerThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4346420F546A8200B0F1BA /* WorkerThread.cpp */; };
    12531253                2E4346550F546A8200B0F1BA /* WorkerThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E4346430F546A8200B0F1BA /* WorkerThread.h */; settings = {ATTRIBUTES = (Private, ); }; };
    1254                 2E4346580F546A9900B0F1BA /* CrossThreadCopier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4346560F546A9900B0F1BA /* CrossThreadCopier.cpp */; };
    1255                 2E4346590F546A9900B0F1BA /* CrossThreadCopier.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E4346570F546A9900B0F1BA /* CrossThreadCopier.h */; settings = {ATTRIBUTES = (Private, ); }; };
    12561254                2E7582EE12764F260062628B /* JSFileReaderCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E7582ED12764F260062628B /* JSFileReaderCustom.cpp */; };
    12571255                2E75841D12779ADA0062628B /* FileReaderLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E75841A12779ADA0062628B /* FileReaderLoader.cpp */; };
    … …  
    20392037                514C767E0CE923A1007EF3CD /* ResourceResponseBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 514C76690CE923A1007EF3CD /* ResourceResponseBase.cpp */; };
    20402038                514C767F0CE923A1007EF3CD /* ResourceResponseBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 514C766A0CE923A1007EF3CD /* ResourceResponseBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
     2039                515F79531CFCA3D000CCED93 /* WebCoreCrossThreadCopier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 515F79511CFCA3C700CCED93 /* WebCoreCrossThreadCopier.cpp */; };
     2040                515F79541CFCA3D500CCED93 /* WebCoreCrossThreadCopier.h in Headers */ = {isa = PBXBuildFile; fileRef = 515F79521CFCA3C700CCED93 /* WebCoreCrossThreadCopier.h */; settings = {ATTRIBUTES = (Private, ); }; };
    20412041                5160300B0CC4251200C8AC25 /* FileSystemPOSIX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5160300A0CC4251200C8AC25 /* FileSystemPOSIX.cpp */; };
    20422042                5160306C0CC4362300C8AC25 /* FileSystemCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5160306B0CC4362300C8AC25 /* FileSystemCF.cpp */; };
    … …  
    22222222                51E4143416A6596300C633C7 /* ResourceHandleTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 51E4143216A6595100C633C7 /* ResourceHandleTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
    22232223                51E6821016387302003BBF3C /* LoaderStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = 51E6820F16387302003BBF3C /* LoaderStrategy.h */; settings = {ATTRIBUTES = (Private, ); }; };
    2224                 51E6FA7C1BBB4FC3008700D9 /* CrossThreadTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 51E6FA7B1BBB4FB5008700D9 /* CrossThreadTask.h */; settings = {ATTRIBUTES = (Private, ); }; };
    22252224                51EC92650CE90DD400F90308 /* JSCustomSQLStatementErrorCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51EC925D0CE90DD400F90308 /* JSCustomSQLStatementErrorCallback.cpp */; };
    22262225                51EE7B381AA50B0500F92B21 /* ResourceLoadInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 51EE7B371AA50B0500F92B21 /* ResourceLoadInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    87438742                2E4346420F546A8200B0F1BA /* WorkerThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerThread.cpp; sourceTree = "<group>"; };
    87448743                2E4346430F546A8200B0F1BA /* WorkerThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerThread.h; sourceTree = "<group>"; };
    8745                 2E4346560F546A9900B0F1BA /* CrossThreadCopier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CrossThreadCopier.cpp; sourceTree = "<group>"; };
    8746                 2E4346570F546A9900B0F1BA /* CrossThreadCopier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CrossThreadCopier.h; sourceTree = "<group>"; };
    87478744                2E7582ED12764F260062628B /* JSFileReaderCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFileReaderCustom.cpp; sourceTree = "<group>"; };
    87488745                2E75841A12779ADA0062628B /* FileReaderLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileReaderLoader.cpp; sourceTree = "<group>"; };
    … …  
    96139610                514C766A0CE923A1007EF3CD /* ResourceResponseBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceResponseBase.h; sourceTree = "<group>"; };
    96149611                515E5FEF195101470086CA5E /* PlatformGamepad.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlatformGamepad.h; sourceTree = "<group>"; };
     9612                515F79511CFCA3C700CCED93 /* WebCoreCrossThreadCopier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebCoreCrossThreadCopier.cpp; sourceTree = "<group>"; };
     9613                515F79521CFCA3C700CCED93 /* WebCoreCrossThreadCopier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreCrossThreadCopier.h; sourceTree = "<group>"; };
    96159614                5160300A0CC4251200C8AC25 /* FileSystemPOSIX.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileSystemPOSIX.cpp; sourceTree = "<group>"; };
    96169615                5160306B0CC4362300C8AC25 /* FileSystemCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileSystemCF.cpp; sourceTree = "<group>"; };
    … …  
    98139812                51E4143216A6595100C633C7 /* ResourceHandleTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceHandleTypes.h; sourceTree = "<group>"; };
    98149813                51E6820F16387302003BBF3C /* LoaderStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoaderStrategy.h; sourceTree = "<group>"; };
    9815                 51E6FA7B1BBB4FB5008700D9 /* CrossThreadTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CrossThreadTask.h; sourceTree = "<group>"; };
    98169814                51EAC5B018163F4E004F1BA4 /* IDBRecordIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBRecordIdentifier.h; sourceTree = "<group>"; };
    98179815                51EC925D0CE90DD400F90308 /* JSCustomSQLStatementErrorCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCustomSQLStatementErrorCallback.cpp; sourceTree = "<group>"; };
    … …  
    2290122899                                339B5B62131DAA3200F48D02 /* CookiesStrategy.h */,
    2290222900                                862F129D18C1572C005C54AF /* CountedUserActivity.h */,
    22903                                 2E4346560F546A9900B0F1BA /* CrossThreadCopier.cpp */,
    22904                                 2E4346570F546A9900B0F1BA /* CrossThreadCopier.h */,
    22905                                 51E6FA7B1BBB4FB5008700D9 /* CrossThreadTask.h */,
    2290622901                                E11AF15011B9A1A300805103 /* Cursor.cpp */,
    2290722902                                F587868402DE3B8601EA4122 /* Cursor.h */,
    … …  
    2304723042                                46DB7D581B20FE58005651B2 /* VNodeTracker.cpp */,
    2304823043                                46DB7D591B20FE58005651B2 /* VNodeTracker.h */,
     23044                                515F79511CFCA3C700CCED93 /* WebCoreCrossThreadCopier.cpp */,
     23045                                515F79521CFCA3C700CCED93 /* WebCoreCrossThreadCopier.h */,
    2304923046                                9380F47109A11AB4001FDB34 /* Widget.cpp */,
    2305023047                                9380F47209A11AB4001FDB34 /* Widget.h */,
    … …  
    2537225369                                E1C416120F6562FD0092D2FB /* CrossOriginAccessControl.h in Headers */,
    2537325370                                E1C415DA0F655D6F0092D2FB /* CrossOriginPreflightResultCache.h in Headers */,
    25374                                 2E4346590F546A9900B0F1BA /* CrossThreadCopier.h in Headers */,
    25375                                 51E6FA7C1BBB4FC3008700D9 /* CrossThreadTask.h in Headers */,
    2537625371                                E169803D1133542D00894115 /* CRuntimeObject.h in Headers */,
    2537725372                                975CA28B130365F800E99AD9 /* Crypto.h in Headers */,
    … …  
    2839528390                                F55B3DDC1251F12D003EF269 /* TimeInputType.h in Headers */,
    2839628391                                7553CFE8108F473F00EA281E /* TimelineRecordFactory.h in Headers */,
     28392                                515F79541CFCA3D500CCED93 /* WebCoreCrossThreadCopier.h in Headers */,
    2839728393                                9305B24D098F1B6B00C28855 /* Timer.h in Headers */,
    2839828394                                E44613B00CD6331000FADA75 /* TimeRanges.h in Headers */,
    … …  
    2929629292                                E1C416170F6563180092D2FB /* CrossOriginAccessControl.cpp in Sources */,
    2929729293                                E1C415DE0F655D7C0092D2FB /* CrossOriginPreflightResultCache.cpp in Sources */,
    29298                                 2E4346580F546A9900B0F1BA /* CrossThreadCopier.cpp in Sources */,
    2929929294                                E16980491133644700894115 /* CRuntimeObject.cpp in Sources */,
    2930029295                                975CA28A130365F800E99AD9 /* Crypto.cpp in Sources */,
    … …  
    3131631311                                D70AD65713E1342B005B50B4 /* RenderRegion.cpp in Sources */,
    3131731312                                BCE93F471517C6D5008CCF74 /* RenderRegionSet.cpp in Sources */,
     31313                                515F79531CFCA3D000CCED93 /* WebCoreCrossThreadCopier.cpp in Sources */,
    3131831314                                A871DFE20A15376B00B12A68 /* RenderReplaced.cpp in Sources */,
    3131931315                                CD4BE52A1CE136EF009D87DA /* GenericTaskQueue.cpp in Sources */,

  • trunk/Source/WebCore/dom/ScriptExecutionContext.h

    r201496 r201504  
    2929
    3030#include "ActiveDOMObject.h"
    31 #include "CrossThreadTask.h"
    3231#include "DOMTimer.h"
    3332#include "ResourceRequest.h"
    … …  
    3534#include "Supplementable.h"
    3635#include <runtime/ConsoleTypes.h>
     36#include <wtf/CrossThreadTask.h>
    3737#include <wtf/HashSet.h>
    3838#include <wtf/NoncopyableFunction.h>

  • trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.cpp

    r201482 r201504  
    3636#include "BlobRegistry.h"
    3737#include "BlobURL.h"
    38 #include "CrossThreadTask.h"
    3938#include "SecurityOrigin.h"
    4039#include <mutex>
     40#include <wtf/CrossThreadTask.h>
    4141#include <wtf/HashMap.h>
    4242#include <wtf/MainThread.h>

  • trunk/Source/WebCore/platform/network/cf/ResourceError.h

    r194419 r201504  
    6262    WEBCORE_EXPORT operator CFErrorRef() const;
    6363
     64    ResourceError isolatedCopy() const { return copy(); }
     65
    6466#if USE(CFNETWORK)
    6567#if PLATFORM(WIN)

  • trunk/Source/WebCore/platform/network/cf/ResourceRequest.h

    r194318 r201504  
    2525 */
    2626
    27 #ifndef ResourceRequest_h
    28 #define ResourceRequest_h
     27#pragma once
    2928
    3029#include "ResourceRequestBase.h"
    … …  
    8281        }
    8382#endif
     83
     84        ResourceRequest isolatedCopy() const { return *ResourceRequest::adopt(copyData()); }
    8485
    8586        WEBCORE_EXPORT void updateFromDelegatePreservingOldProperties(const ResourceRequest&);
    … …  
    163164
    164165} // namespace WebCore
    165 
    166 #endif // ResourceRequest_h

  • trunk/Source/WebCore/platform/network/cf/ResourceResponse.h

    r194378 r201504  
    2424 */
    2525
    26 #ifndef ResourceResponse_h
    27 #define ResourceResponse_h
     26#pragma once
    2827
    2928#include "ResourceResponseBase.h"
    … …  
    7372    {
    7473    }
     74
     75    ResourceResponse isolatedCopy() const { return *ResourceResponse::adopt(copyData()); }
    7576
    7677    unsigned memoryUsage() const
    … …  
    125126
    126127} // namespace WebCore
    127 
    128 #endif // ResourceResponse_h

  • trunk/Source/WebKit2/CMakeLists.txt

    r201168 r201504  
    260260    Shared/WebContextMenuItemData.cpp
    261261    Shared/WebCoreArgumentCoders.cpp
    262     Shared/WebCrossThreadCopier.cpp
    263262    Shared/WebEvent.cpp
    264263    Shared/WebEventConversion.cpp

  • trunk/Source/WebKit2/ChangeLog

    r201493 r201504  
     12016-05-30  Brady Eidson  <beidson@apple.com>
     2
     3        Move CrossThreadCopier/CrossThreadTask to WTF.
     4        https://bugs.webkit.org/show_bug.cgi?id=158207
     5
     6        Reviewed by Alex Christensen.
     7
     8        * CMakeLists.txt:
     9        * WebKit2.xcodeproj/project.pbxproj:
     10
     11        * DatabaseProcess/DatabaseProcess.cpp:
     12        * DatabaseProcess/DatabaseProcess.h:
     13
     14        * Shared/WebCrossThreadCopier.cpp: Removed.
     15        * Shared/WebCrossThreadCopier.h: Removed.
     16
    1172016-05-28  Chris Dumez  <cdumez@apple.com>
    218

  • trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp

    r201195 r201504  
    3434#include "DatabaseToWebProcessConnection.h"
    3535#include "WebCoreArgumentCoders.h"
    36 #include "WebCrossThreadCopier.h"
    3736#include "WebsiteData.h"
    38 #include <WebCore/CrossThreadTask.h>
    3937#include <WebCore/FileSystem.h>
    4038#include <WebCore/NotImplemented.h>
    4139#include <WebCore/SessionID.h>
    4240#include <WebCore/TextEncoding.h>
     41#include <wtf/CrossThreadTask.h>
    4342#include <wtf/MainThread.h>
    4443

  • trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h

    r201195 r201504  
    2424 */
    2525
    26 #ifndef DatabaseProcess_h
    27 #define DatabaseProcess_h
     26#pragma once
    2827
    2928#if ENABLE(DATABASE_PROCESS)
    … …  
    3433#include <WebCore/IDBServer.h>
    3534#include <WebCore/UniqueIDBDatabase.h>
     35#include <wtf/CrossThreadTask.h>
    3636#include <wtf/NeverDestroyed.h>
    3737
    3838namespace WebCore {
    39 class CrossThreadTask;
    4039class SessionID;
    4140struct SecurityOriginData;
    … …  
    7069    WorkQueue& queue() { return m_queue.get(); }
    7170
    72     void postDatabaseTask(std::unique_ptr<WebCore::CrossThreadTask>);
     71    void postDatabaseTask(std::unique_ptr<CrossThreadTask>);
    7372
    7473#if ENABLE(INDEXED_DATABASE)
    … …  
    128127    HashMap<uint64_t, std::function<void (const SandboxExtension::HandleArray&)>> m_sandboxExtensionForBlobsCompletionHandlers;
    129128
    130     Deque<std::unique_ptr<WebCore::CrossThreadTask>> m_databaseTasks;
     129    Deque<std::unique_ptr<CrossThreadTask>> m_databaseTasks;
    131130    Lock m_databaseTaskMutex;
    132131};
    … …  
    135134
    136135#endif // ENABLE(DATABASE_PROCESS)
    137 
    138 #endif // DatabaseProcess_h

  • trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r200395 r201504  
    930930                515E772C184008B90007203F /* DatabaseProcessCreationParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 515E772A184008B90007203F /* DatabaseProcessCreationParameters.h */; };
    931931                5160BFE113381DF900918999 /* LoggingFoundation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5160BFE013381DF900918999 /* LoggingFoundation.mm */; };
    932                 516311871858446600534647 /* WebCrossThreadCopier.h in Headers */ = {isa = PBXBuildFile; fileRef = 516311861858446600534647 /* WebCrossThreadCopier.h */; };
    933932                516319921628980A00E22F00 /* NetworkProcessProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 516319911628980A00E22F00 /* NetworkProcessProxyMac.mm */; };
    934933                5163199416289A6000E22F00 /* NetworkProcessMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51ACC9341628064800342550 /* NetworkProcessMessageReceiver.cpp */; };
    … …  
    973972                51B15A8413843A3900321AD8 /* EnvironmentUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51B15A8213843A3900321AD8 /* EnvironmentUtilities.cpp */; };
    974973                51B15A8513843A3900321AD8 /* EnvironmentUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 51B15A8313843A3900321AD8 /* EnvironmentUtilities.h */; };
    975                 51BA24461858F55D00EA2811 /* WebCrossThreadCopier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51BA24451858F41500EA2811 /* WebCrossThreadCopier.cpp */; };
    976974                51CD1C5D1B3493AF00142CA5 /* WKSecurityOriginRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51CD1C591B3493A900142CA5 /* WKSecurityOriginRef.cpp */; };
    977975                51CD1C5E1B3493B400142CA5 /* WKSecurityOriginRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 51CD1C5A1B3493A900142CA5 /* WKSecurityOriginRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    29542952                515E772A184008B90007203F /* DatabaseProcessCreationParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseProcessCreationParameters.h; sourceTree = "<group>"; };
    29552953                5160BFE013381DF900918999 /* LoggingFoundation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LoggingFoundation.mm; sourceTree = "<group>"; };
    2956                 516311861858446600534647 /* WebCrossThreadCopier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCrossThreadCopier.h; sourceTree = "<group>"; };
    29572954                516319911628980A00E22F00 /* NetworkProcessProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NetworkProcessProxyMac.mm; path = mac/NetworkProcessProxyMac.mm; sourceTree = "<group>"; };
    29582955                5164C0941B05B757004F102A /* ChildProcess.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ChildProcess.messages.in; sourceTree = "<group>"; };
    … …  
    30022999                51B15A8213843A3900321AD8 /* EnvironmentUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EnvironmentUtilities.cpp; path = unix/EnvironmentUtilities.cpp; sourceTree = "<group>"; };
    30033000                51B15A8313843A3900321AD8 /* EnvironmentUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EnvironmentUtilities.h; path = unix/EnvironmentUtilities.h; sourceTree = "<group>"; };
    3004                 51BA24451858F41500EA2811 /* WebCrossThreadCopier.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebCrossThreadCopier.cpp; sourceTree = "<group>"; };
    30053001                51CD1C591B3493A900142CA5 /* WKSecurityOriginRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKSecurityOriginRef.cpp; sourceTree = "<group>"; };
    30063002                51CD1C5A1B3493A900142CA5 /* WKSecurityOriginRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKSecurityOriginRef.h; sourceTree = "<group>"; };
    … …  
    45264522                                939AE7651316E99C00AE06A6 /* WebCoreArgumentCoders.cpp */,
    45274523                                BC1DD7B1114DC396005ADAF3 /* WebCoreArgumentCoders.h */,
    4528                                 51BA24451858F41500EA2811 /* WebCrossThreadCopier.cpp */,
    4529                                 516311861858446600534647 /* WebCrossThreadCopier.h */,
    45304524                                C0337DAD127A24FE008FF4F4 /* WebEvent.cpp */,
    45314525                                BC032DAF10F4380F0058C15A /* WebEvent.h */,
    … …  
    77057699                                BC1DD7B2114DC396005ADAF3 /* WebCoreArgumentCoders.h in Headers */,
    77067700                                512F589B12A8838800629530 /* WebCredential.h in Headers */,
    7707                                 516311871858446600534647 /* WebCrossThreadCopier.h in Headers */,
    77087701                                1AA83F6D1A5B63FF00026EC6 /* WebDatabaseProvider.h in Headers */,
    77097702                                CD19A26E1A13E834008D650E /* WebDiagnosticLoggingClient.h in Headers */,
    … …  
    91909183                                BCE23263122C6CF300D5C35A /* WebCoreArgumentCodersMac.mm in Sources */,
    91919184                                512F589A12A8838800629530 /* WebCredential.cpp in Sources */,
    9192                                 51BA24461858F55D00EA2811 /* WebCrossThreadCopier.cpp in Sources */,
    91939185                                1AA83F6C1A5B63FF00026EC6 /* WebDatabaseProvider.cpp in Sources */,
    91949186                                CD19A26D1A13E82A008D650E /* WebDiagnosticLoggingClient.cpp in Sources */,
Note: See TracChangeset for help on using the changeset viewer.