Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / quota / DOMWindowQuota.cpp

diff --git a/src/third_party/WebKit/Source/modules/quota/DOMWindowQuota.cpp b/src/third_party/WebKit/Source/modules/quota/DOMWindowQuota.cpp
index 771c9cf..ed8e826 100644 (file)
--- a/src/third_party/WebKit/Source/modules/quota/DOMWindowQuota.cpp
+++ b/src/third_party/WebKit/Source/modules/quota/DOMWindowQuota.cpp
@@ -33,15 +33,14 @@
 
 #include "core/dom/Document.h"
 #include "core/frame/DOMWindow.h"
-#include "core/frame/Frame.h"
-#include "core/page/PageConsole.h"
-#include "modules/quota/StorageInfo.h"
+#include "core/frame/LocalFrame.h"
+#include "modules/quota/DeprecatedStorageInfo.h"
 #include "wtf/PassRefPtr.h"
 
 namespace WebCore {
 
-DOMWindowQuota::DOMWindowQuota(DOMWindow* window)
-    : DOMWindowProperty(window->frame())
+DOMWindowQuota::DOMWindowQuota(DOMWindow& window)
+    : DOMWindowProperty(window.frame())
 {
 }
 
@@ -55,27 +54,33 @@ const char* DOMWindowQuota::supplementName()
 }
 
 // static
-DOMWindowQuota* DOMWindowQuota::from(DOMWindow* window)
+DOMWindowQuota& DOMWindowQuota::from(DOMWindow& window)
 {
-    DOMWindowQuota* supplement = static_cast<DOMWindowQuota*>(Supplement<DOMWindow>::from(window, supplementName()));
+    DOMWindowQuota* supplement = static_cast<DOMWindowQuota*>(WillBeHeapSupplement<DOMWindow>::from(window, supplementName()));
     if (!supplement) {
         supplement = new DOMWindowQuota(window);
-        provideTo(window, supplementName(), adoptPtr(supplement));
+        provideTo(window, supplementName(), adoptPtrWillBeNoop(supplement));
     }
-    return supplement;
+    return *supplement;
 }
 
 // static
-StorageInfo* DOMWindowQuota::webkitStorageInfo(DOMWindow* window)
+DeprecatedStorageInfo* DOMWindowQuota::webkitStorageInfo(DOMWindow& window)
 {
-    return DOMWindowQuota::from(window)->webkitStorageInfo();
+    return DOMWindowQuota::from(window).webkitStorageInfo();
 }
 
-StorageInfo* DOMWindowQuota::webkitStorageInfo() const
+DeprecatedStorageInfo* DOMWindowQuota::webkitStorageInfo() const
 {
     if (!m_storageInfo && frame())
-        m_storageInfo = StorageInfo::create();
+        m_storageInfo = DeprecatedStorageInfo::create();
     return m_storageInfo.get();
 }
 
+void DOMWindowQuota::trace(Visitor* visitor)
+{
+    visitor->trace(m_storageInfo);
+    WillBeHeapSupplement<DOMWindow>::trace(visitor);
+}
+
 } // namespace WebCore