OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009 Google Inc. All Rights Reserved. | 2 * Copyright (C) 2009 Google Inc. All Rights Reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 19 matching lines...) Expand all Loading... |
30 #include "public/platform/WebStorageArea.h" | 30 #include "public/platform/WebStorageArea.h" |
31 #include "public/platform/WebStorageNamespace.h" | 31 #include "public/platform/WebStorageNamespace.h" |
32 #include "public/platform/WebString.h" | 32 #include "public/platform/WebString.h" |
33 #include "ChromeClientImpl.h" | 33 #include "ChromeClientImpl.h" |
34 #include "StorageAreaProxy.h" | 34 #include "StorageAreaProxy.h" |
35 #include "WebKit.h" | 35 #include "WebKit.h" |
36 #include "WebViewClient.h" | 36 #include "WebViewClient.h" |
37 #include "WebViewImpl.h" | 37 #include "WebViewImpl.h" |
38 #include "core/page/Chrome.h" | 38 #include "core/page/Chrome.h" |
39 #include "core/page/Page.h" | 39 #include "core/page/Page.h" |
40 #include "weborigin/SecurityOrigin.h" | 40 #include "platform/weborigin/SecurityOrigin.h" |
41 #include "wtf/MainThread.h" | 41 #include "wtf/MainThread.h" |
42 | 42 |
43 namespace WebCore { | 43 namespace WebCore { |
44 | 44 |
45 PassOwnPtr<StorageArea> StorageNamespace::localStorageArea(SecurityOrigin* origi
n) | 45 PassOwnPtr<StorageArea> StorageNamespace::localStorageArea(SecurityOrigin* origi
n) |
46 { | 46 { |
47 ASSERT(isMainThread()); | 47 ASSERT(isMainThread()); |
48 static blink::WebStorageNamespace* localStorageNamespace = 0; | 48 static blink::WebStorageNamespace* localStorageNamespace = 0; |
49 if (!localStorageNamespace) | 49 if (!localStorageNamespace) |
50 localStorageNamespace = blink::Platform::current()->createLocalStorageNa
mespace(); | 50 localStorageNamespace = blink::Platform::current()->createLocalStorageNa
mespace(); |
(...skipping 19 matching lines...) Expand all Loading... |
70 { | 70 { |
71 return adoptPtr(new StorageAreaProxy(adoptPtr(m_storageNamespace->createStor
ageArea(origin->toString())), SessionStorage)); | 71 return adoptPtr(new StorageAreaProxy(adoptPtr(m_storageNamespace->createStor
ageArea(origin->toString())), SessionStorage)); |
72 } | 72 } |
73 | 73 |
74 bool StorageNamespaceProxy::isSameNamespace(const blink::WebStorageNamespace& se
ssionNamespace) | 74 bool StorageNamespaceProxy::isSameNamespace(const blink::WebStorageNamespace& se
ssionNamespace) |
75 { | 75 { |
76 return m_storageNamespace && m_storageNamespace->isSameNamespace(sessionName
space); | 76 return m_storageNamespace && m_storageNamespace->isSameNamespace(sessionName
space); |
77 } | 77 } |
78 | 78 |
79 } // namespace WebCore | 79 } // namespace WebCore |
OLD | NEW |