third_party/WebKit/Source/modules/storage/StorageNamespace.cpp - Issue 1818233003: Merge WTF::initializeMainThread into WTF::initialize

Side by Side Diff: third_party/WebKit/Source/modules/storage/StorageNamespace.cpp

Issue 1818233003: Merge WTF::initializeMainThread into WTF::initialize (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « third_party/WebKit/Source/modules/mediastream/URLMediaStream.cpp ('k') | third_party/WebKit/Source/modules/webaudio/AbstractAudioContext.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 12 matching lines...) Expand all Loading...
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

24 */	24 */

25	25

26 #include "modules/storage/StorageNamespace.h"	26 #include "modules/storage/StorageNamespace.h"

27	27

28 #include "modules/storage/StorageArea.h"	28 #include "modules/storage/StorageArea.h"

29 #include "platform/weborigin/SecurityOrigin.h"	29 #include "platform/weborigin/SecurityOrigin.h"

30 #include "public/platform/Platform.h"	30 #include "public/platform/Platform.h"

31 #include "public/platform/WebStorageArea.h"	31 #include "public/platform/WebStorageArea.h"

32 #include "public/platform/WebStorageNamespace.h"	32 #include "public/platform/WebStorageNamespace.h"

33 #include "wtf/MainThread.h"

34	33

35 namespace blink {	34 namespace blink {

36	35

37 StorageNamespace::StorageNamespace(PassOwnPtr<WebStorageNamespace> webStorageNam espace)	36 StorageNamespace::StorageNamespace(PassOwnPtr<WebStorageNamespace> webStorageNam espace)

38 : m_webStorageNamespace(webStorageNamespace)	37 : m_webStorageNamespace(webStorageNamespace)

39 {	38 {

40 }	39 }

41	40

42 StorageNamespace::~StorageNamespace()	41 StorageNamespace::~StorageNamespace()

43 {	42 {

(...skipping 12 matching lines...) Expand all Loading...
56 {	55 {

57 return StorageArea::create(adoptPtr(m_webStorageNamespace->createStorageArea (origin->toString())), SessionStorage);	56 return StorageArea::create(adoptPtr(m_webStorageNamespace->createStorageArea (origin->toString())), SessionStorage);

58 }	57 }

59	58

60 bool StorageNamespace::isSameNamespace(const WebStorageNamespace& sessionNamespa ce) const	59 bool StorageNamespace::isSameNamespace(const WebStorageNamespace& sessionNamespa ce) const

61 {	60 {

62 return m_webStorageNamespace && m_webStorageNamespace->isSameNamespace(sessi onNamespace);	61 return m_webStorageNamespace && m_webStorageNamespace->isSameNamespace(sessi onNamespace);

63 }	62 }

64	63

65 } // namespace blink	64 } // namespace blink

OLD	NEW