Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / loader / appcache / ApplicationCache.h

diff --git a/src/third_party/WebKit/Source/core/loader/appcache/ApplicationCache.h b/src/third_party/WebKit/Source/core/loader/appcache/ApplicationCache.h
index 3f2efec..47c7b3c 100644 (file)
--- a/src/third_party/WebKit/Source/core/loader/appcache/ApplicationCache.h
+++ b/src/third_party/WebKit/Source/core/loader/appcache/ApplicationCache.h
@@ -26,7 +26,6 @@
 #ifndef ApplicationCache_h
 #define ApplicationCache_h
 
-#include "bindings/v8/ScriptWrappable.h"
 #include "core/events/EventTarget.h"
 #include "core/loader/appcache/ApplicationCacheHost.h"
 #include "core/frame/DOMWindowProperty.h"
@@ -35,23 +34,28 @@
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 
-namespace WebCore {
+namespace blink {
 
 class ExceptionState;
 class LocalFrame;
-class KURL;
 
-class ApplicationCache FINAL : public RefCountedWillBeRefCountedGarbageCollected<ApplicationCache>, public ScriptWrappable, public EventTargetWithInlineData, public DOMWindowProperty {
+class ApplicationCache final : public RefCountedWillBeGarbageCollectedFinalized<ApplicationCache>, public EventTargetWithInlineData, public DOMWindowProperty {
+    DEFINE_WRAPPERTYPEINFO();
     REFCOUNTED_EVENT_TARGET(ApplicationCache);
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(ApplicationCache);
 public:
     static PassRefPtrWillBeRawPtr<ApplicationCache> create(LocalFrame* frame)
     {
-        return adoptRefWillBeRefCountedGarbageCollected(new ApplicationCache(frame));
+        return adoptRefWillBeNoop(new ApplicationCache(frame));
+    }
+    virtual ~ApplicationCache()
+    {
+#if !ENABLE(OILPAN)
+        ASSERT(!m_frame);
+#endif
     }
-    virtual ~ApplicationCache() { ASSERT(!m_frame); }
 
-    virtual void willDestroyGlobalObjectInFrame() OVERRIDE;
+    virtual void willDestroyGlobalObjectInFrame() override;
 
     unsigned short status() const;
     void update(ExceptionState&);
@@ -69,17 +73,19 @@ public:
     DEFINE_ATTRIBUTE_EVENT_LISTENER(cached);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(obsolete);
 
-    virtual const AtomicString& interfaceName() const OVERRIDE;
-    virtual ExecutionContext* executionContext() const OVERRIDE;
+    virtual const AtomicString& interfaceName() const override;
+    virtual ExecutionContext* executionContext() const override;
 
     static const AtomicString& toEventType(ApplicationCacheHost::EventID);
 
+    virtual void trace(Visitor*) override;
+
 private:
     explicit ApplicationCache(LocalFrame*);
 
     ApplicationCacheHost* applicationCacheHost() const;
 };
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // ApplicationCache_h