Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(91)

Side by Side Diff: Source/modules/indexeddb/IDBVersionChangeEvent.cpp

Issue 426063010: IndexedDB: Fixed threading bugs with use of AtomicStrings. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase to ToT Created 6 years, 4 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 | « Source/modules/indexeddb/IDBTransaction.cpp ('k') | Source/modules/indexeddb/IndexedDBNames.in » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 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 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 * 13 *
14 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY 14 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
17 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY 17 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "modules/indexeddb/IDBVersionChangeEvent.h" 27 #include "modules/indexeddb/IDBVersionChangeEvent.h"
28 28
29 #include "modules/IndexedDBNames.h"
30
29 namespace blink { 31 namespace blink {
30 32
31 33
32 IDBVersionChangeEventInit::IDBVersionChangeEventInit() 34 IDBVersionChangeEventInit::IDBVersionChangeEventInit()
33 : oldVersion(0) 35 : oldVersion(0)
34 { 36 {
35 } 37 }
36 38
37 IDBVersionChangeEvent::IDBVersionChangeEvent() 39 IDBVersionChangeEvent::IDBVersionChangeEvent()
38 : m_dataLoss(blink::WebIDBDataLossNone) 40 : m_dataLoss(blink::WebIDBDataLossNone)
(...skipping 25 matching lines...) Expand all
64 } 66 }
65 67
66 unsigned long long IDBVersionChangeEvent::newVersion(bool& isNull) const 68 unsigned long long IDBVersionChangeEvent::newVersion(bool& isNull) const
67 { 69 {
68 isNull = m_newVersion.isNull(); 70 isNull = m_newVersion.isNull();
69 return isNull ? 0 : m_newVersion.get(); 71 return isNull ? 0 : m_newVersion.get();
70 } 72 }
71 73
72 const AtomicString& IDBVersionChangeEvent::dataLoss() const 74 const AtomicString& IDBVersionChangeEvent::dataLoss() const
73 { 75 {
74 DEFINE_STATIC_LOCAL(AtomicString, total, ("total", AtomicString::ConstructFr omLiteral));
75 if (m_dataLoss == blink::WebIDBDataLossTotal) 76 if (m_dataLoss == blink::WebIDBDataLossTotal)
76 return total; 77 return IndexedDBNames::total;
77 DEFINE_STATIC_LOCAL(AtomicString, none, ("none", AtomicString::ConstructFrom Literal)); 78 return IndexedDBNames::none;
78 return none;
79 } 79 }
80 80
81 const AtomicString& IDBVersionChangeEvent::interfaceName() const 81 const AtomicString& IDBVersionChangeEvent::interfaceName() const
82 { 82 {
83 return EventNames::IDBVersionChangeEvent; 83 return EventNames::IDBVersionChangeEvent;
84 } 84 }
85 85
86 void IDBVersionChangeEvent::trace(Visitor* visitor) 86 void IDBVersionChangeEvent::trace(Visitor* visitor)
87 { 87 {
88 Event::trace(visitor); 88 Event::trace(visitor);
89 } 89 }
90 90
91 } // namespace blink 91 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/indexeddb/IDBTransaction.cpp ('k') | Source/modules/indexeddb/IndexedDBNames.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698