Changeset 141648 in webkit
- Timestamp:
- Feb 1, 2013 2:56:20 PM (11 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 1 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r141640 r141648 1 2013-02-01 Anders Carlsson <andersca@apple.com> 2 3 More work on UI side storage 4 https://bugs.webkit.org/show_bug.cgi?id=108700 5 6 Reviewed by Sam Weinig. 7 8 * DerivedSources.make: 9 Add StorageManager.messages.in. 10 11 * Platform/CoreIPC/HandleMessage.h: 12 (CoreIPC::callMemberFunction): 13 Add new overload. 14 15 * UIProcess/Storage/StorageManager.cpp: 16 (WebKit::StorageManager::didReceiveMessageOnConnectionWorkQueue): 17 Call the right function. 18 19 (WebKit::StorageManager::createStorageArea): 20 (WebKit::StorageManager::destroyStorageArea): 21 Add stubs. 22 23 * UIProcess/Storage/StorageManager.messages.in: Added. 24 Add new messages files. 25 26 * WebKit2.xcodeproj/project.pbxproj: 27 Add new files. 28 29 * WebProcess/Storage/StorageAreaProxy.cpp: 30 (WebKit::StorageAreaProxy::~StorageAreaProxy): 31 Add another FIXME. 32 33 (WebKit::StorageAreaProxy::canAccessStorage): 34 (WebKit::StorageAreaProxy::incrementAccessCount): 35 (WebKit::StorageAreaProxy::decrementAccessCount): 36 Implement these. 37 1 38 2013-02-01 Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> 2 39 -
trunk/Source/WebKit2/DerivedSources.make
r141335 r141648 54 54 $(WebKit2)/UIProcess/Plugins \ 55 55 $(WebKit2)/UIProcess/SharedWorkers \ 56 $(WebKit2)/UIProcess/Storage \ 56 57 $(WebKit2)/UIProcess/mac \ 57 58 # … … 76 77 SharedWorkerProcess \ 77 78 SharedWorkerProcessProxy \ 79 StorageManager \ 78 80 WebApplicationCacheManager \ 79 81 WebApplicationCacheManagerProxy \ -
trunk/Source/WebKit2/Platform/CoreIPC/HandleMessage.h
r132926 r141648 236 236 } 237 237 238 template<typename C, typename MF, typename P1, typename P2, typename P3> 239 void callMemberFunction(Connection* connection, const Arguments3<P1, P2, P3>& args, C* object, MF function) 240 { 241 (object->*function)(connection, args.argument1, args.argument2, args.argument3); 242 } 243 238 244 template<typename C, typename MF, typename P1, typename P2, typename P3, typename P4> 239 245 void callMemberFunction(Connection* connection, const Arguments4<P1, P2, P3, P4>& args, C* object, MF function) -
trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp
r141510 r141648 27 27 #include "StorageManager.h" 28 28 29 #include "StorageManagerMessages.h" 30 29 31 namespace WebKit { 30 32 … … 42 44 } 43 45 46 void StorageManager::didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, bool& didHandleMessage) 47 { 48 if (decoder.messageReceiverName() == Messages::StorageManager::messageReceiverName()) 49 didReceiveStorageManagerMessageOnConnectionWorkQueue(connection, decoder, didHandleMessage); 50 } 51 52 void StorageManager::createStorageArea(CoreIPC::Connection*, uint64_t storageAreaID, uint64_t storageNamespaceID, const SecurityOriginData&) 53 { 54 } 55 56 void StorageManager::destroyStorageArea(CoreIPC::Connection*, uint64_t storageAreaID) 57 { 58 } 59 44 60 } // namespace WebKit -
trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h
r141510 r141648 27 27 #define StorageManager_h 28 28 29 #include "Connection.h" 29 30 #include <wtf/PassRefPtr.h> 30 31 #include <wtf/ThreadSafeRefCounted.h> 31 32 32 33 namespace WebKit { 34 struct SecurityOriginData; 33 35 34 class StorageManager : public ThreadSafeRefCounted<StorageManager> {36 class StorageManager : public ThreadSafeRefCounted<StorageManager>, public CoreIPC::Connection::QueueClient { 35 37 public: 36 38 static PassRefPtr<StorageManager> create(); … … 39 41 private: 40 42 StorageManager(); 43 44 // CoreIPC::Connection::QueueClient. 45 virtual void didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageDecoder&, bool& didHandleMessage) OVERRIDE; 46 47 void didReceiveStorageManagerMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageDecoder&, bool& didHandleMessage); 48 49 // Message handlers. 50 void createStorageArea(CoreIPC::Connection*, uint64_t storageAreaID, uint64_t storageNamespaceID, const SecurityOriginData&); 51 void destroyStorageArea(CoreIPC::Connection*, uint64_t storageAreaID); 41 52 }; 42 53 -
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
r141473 r141648 229 229 1AB16AED164B41E400290D62 /* RemoteGraphicsLayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AB16AEB164B41E400290D62 /* RemoteGraphicsLayer.mm */; }; 230 230 1AB16AEE164B41E400290D62 /* RemoteGraphicsLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB16AEC164B41E400290D62 /* RemoteGraphicsLayer.h */; }; 231 1AB31A9616BC688100F6DBC9 /* StorageManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB31A9416BC688100F6DBC9 /* StorageManagerMessageReceiver.cpp */; }; 232 1AB31A9716BC688100F6DBC9 /* StorageManagerMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB31A9516BC688100F6DBC9 /* StorageManagerMessages.h */; }; 231 233 1AB7D4CA1288AAA700CFD08C /* DownloadProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB7D4C81288AAA700CFD08C /* DownloadProxy.h */; }; 232 234 1AB7D4CB1288AAA700CFD08C /* DownloadProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB7D4C91288AAA700CFD08C /* DownloadProxy.cpp */; }; … … 1518 1520 1AB16AEB164B41E400290D62 /* RemoteGraphicsLayer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RemoteGraphicsLayer.mm; sourceTree = "<group>"; }; 1519 1521 1AB16AEC164B41E400290D62 /* RemoteGraphicsLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteGraphicsLayer.h; sourceTree = "<group>"; }; 1522 1AB31A9316BC65AB00F6DBC9 /* StorageManager.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = StorageManager.messages.in; sourceTree = "<group>"; }; 1523 1AB31A9416BC688100F6DBC9 /* StorageManagerMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StorageManagerMessageReceiver.cpp; path = StorageManagerMessageReceiver.cpp; sourceTree = "<group>"; }; 1524 1AB31A9516BC688100F6DBC9 /* StorageManagerMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StorageManagerMessages.h; path = StorageManagerMessages.h; sourceTree = "<group>"; }; 1520 1525 1AB7D4C81288AAA700CFD08C /* DownloadProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DownloadProxy.h; sourceTree = "<group>"; }; 1521 1526 1AB7D4C91288AAA700CFD08C /* DownloadProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DownloadProxy.cpp; sourceTree = "<group>"; }; … … 2757 2762 1A44B95916B73F9F00B7BBD8 /* StorageManager.cpp */, 2758 2763 1A44B95A16B73F9F00B7BBD8 /* StorageManager.h */, 2764 1AB31A9316BC65AB00F6DBC9 /* StorageManager.messages.in */, 2759 2765 ); 2760 2766 path = Storage; … … 4641 4647 E1EDFDB31628AD730039ECDA /* SharedWorkerProcessProxyMessageReceiver.cpp */, 4642 4648 E1EDFDB41628AD730039ECDA /* SharedWorkerProcessProxyMessages.h */, 4649 1AB31A9416BC688100F6DBC9 /* StorageManagerMessageReceiver.cpp */, 4650 1AB31A9516BC688100F6DBC9 /* StorageManagerMessages.h */, 4643 4651 512E3568130B57F000ABD19A /* WebApplicationCacheManagerMessageReceiver.cpp */, 4644 4652 512E3569130B57F000ABD19A /* WebApplicationCacheManagerMessages.h */, … … 5358 5366 A5EFD38C16B0E88C00B2F0E8 /* WKPageVisibilityTypes.h in Headers */, 5359 5367 1AC4C82916B876A90069DCCD /* MessageFlags.h in Headers */, 5368 1AB31A9716BC688100F6DBC9 /* StorageManagerMessages.h in Headers */, 5360 5369 ); 5361 5370 runOnlyForDeploymentPostprocessing = 0; … … 6479 6488 BC82844D16B5081C00A278FE /* PluginServiceEntryPoint.mm in Sources */, 6480 6489 BCBECDE716B6416800047A1A /* XPCServiceEntryPoint.mm in Sources */, 6490 1AB31A9616BC688100F6DBC9 /* StorageManagerMessageReceiver.cpp in Sources */, 6481 6491 ); 6482 6492 runOnlyForDeploymentPostprocessing = 0; -
trunk/Source/WebKit2/WebProcess/Storage/StorageAreaProxy.cpp
r140756 r141648 27 27 #include "StorageAreaProxy.h" 28 28 29 #include <WebCore/Frame.h> 29 30 #include <WebCore/SecurityOrigin.h> 30 31 … … 45 46 StorageAreaProxy::~StorageAreaProxy() 46 47 { 48 // FIXME: Implement. 47 49 } 48 50 … … 93 95 } 94 96 95 bool StorageAreaProxy::canAccessStorage(Frame* ) const97 bool StorageAreaProxy::canAccessStorage(Frame* frame) const 96 98 { 97 // FIXME: Implement this. 98 ASSERT_NOT_REACHED(); 99 return false; 99 return frame && frame->page(); 100 100 } 101 101 … … 109 109 void StorageAreaProxy::incrementAccessCount() 110 110 { 111 // FIXME: Implement this. 112 ASSERT_NOT_REACHED(); 111 // Storage access is handled in the UI process, so there's nothing to do here. 113 112 } 114 113 115 114 void StorageAreaProxy::decrementAccessCount() 116 115 { 117 // FIXME: Implement this. 118 ASSERT_NOT_REACHED(); 116 // Storage access is handled in the UI process, so there's nothing to do here. 119 117 } 120 118
Note: See TracChangeset
for help on using the changeset viewer.