OLD | NEW |
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 are met: | 5 * modification, are permitted provided that the following conditions are met: |
6 * | 6 * |
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 17 matching lines...) Expand all Loading... |
28 | 28 |
29 #include "core/dom/Document.h" | 29 #include "core/dom/Document.h" |
30 #include "core/frame/LocalDOMWindow.h" | 30 #include "core/frame/LocalDOMWindow.h" |
31 #include "core/page/Page.h" | 31 #include "core/page/Page.h" |
32 #include "modules/indexeddb/IDBFactory.h" | 32 #include "modules/indexeddb/IDBFactory.h" |
33 | 33 |
34 namespace blink { | 34 namespace blink { |
35 | 35 |
36 DOMWindowIndexedDatabase::DOMWindowIndexedDatabase(LocalDOMWindow& window) | 36 DOMWindowIndexedDatabase::DOMWindowIndexedDatabase(LocalDOMWindow& window) |
37 : DOMWindowProperty(window.frame()) | 37 : DOMWindowProperty(window.frame()) |
38 , m_window(window) | 38 , m_window(&window) |
39 { | 39 { |
40 } | 40 } |
41 | 41 |
42 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(DOMWindowIndexedDatabase); | 42 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(DOMWindowIndexedDatabase); |
43 | 43 |
44 DEFINE_TRACE(DOMWindowIndexedDatabase) | 44 DEFINE_TRACE(DOMWindowIndexedDatabase) |
45 { | 45 { |
| 46 visitor->trace(m_window); |
46 visitor->trace(m_idbFactory); | 47 visitor->trace(m_idbFactory); |
47 WillBeHeapSupplement<LocalDOMWindow>::trace(visitor); | 48 WillBeHeapSupplement<LocalDOMWindow>::trace(visitor); |
48 DOMWindowProperty::trace(visitor); | 49 DOMWindowProperty::trace(visitor); |
49 } | 50 } |
50 | 51 |
51 const char* DOMWindowIndexedDatabase::supplementName() | 52 const char* DOMWindowIndexedDatabase::supplementName() |
52 { | 53 { |
53 return "DOMWindowIndexedDatabase"; | 54 return "DOMWindowIndexedDatabase"; |
54 } | 55 } |
55 | 56 |
(...skipping 19 matching lines...) Expand all Loading... |
75 DOMWindowProperty::willDetachGlobalObjectFromFrame(); | 76 DOMWindowProperty::willDetachGlobalObjectFromFrame(); |
76 } | 77 } |
77 | 78 |
78 IDBFactory* DOMWindowIndexedDatabase::indexedDB(DOMWindow& window) | 79 IDBFactory* DOMWindowIndexedDatabase::indexedDB(DOMWindow& window) |
79 { | 80 { |
80 return from(toLocalDOMWindow(window)).indexedDB(); | 81 return from(toLocalDOMWindow(window)).indexedDB(); |
81 } | 82 } |
82 | 83 |
83 IDBFactory* DOMWindowIndexedDatabase::indexedDB() | 84 IDBFactory* DOMWindowIndexedDatabase::indexedDB() |
84 { | 85 { |
85 Document* document = m_window.document(); | 86 Document* document = m_window->document(); |
86 if (!document) | 87 if (!document) |
87 return nullptr; | 88 return nullptr; |
88 | 89 |
89 Page* page = document->page(); | 90 Page* page = document->page(); |
90 if (!page) | 91 if (!page) |
91 return nullptr; | 92 return nullptr; |
92 | 93 |
93 if (!m_window.isCurrentlyDisplayedInFrame()) | 94 if (!m_window->isCurrentlyDisplayedInFrame()) |
94 return nullptr; | 95 return nullptr; |
95 | 96 |
96 if (!m_idbFactory) | 97 if (!m_idbFactory) |
97 m_idbFactory = IDBFactory::create(IndexedDBClient::create()); | 98 m_idbFactory = IDBFactory::create(IndexedDBClient::create()); |
98 return m_idbFactory.get(); | 99 return m_idbFactory.get(); |
99 } | 100 } |
100 | 101 |
101 } // namespace blink | 102 } // namespace blink |
OLD | NEW |