Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / frame / Navigator.cpp

diff --git a/src/third_party/WebKit/Source/core/frame/Navigator.cpp b/src/third_party/WebKit/Source/core/frame/Navigator.cpp
index 98626de..3156688 100644 (file)
--- a/src/third_party/WebKit/Source/core/frame/Navigator.cpp
+++ b/src/third_party/WebKit/Source/core/frame/Navigator.cpp
@@ -54,7 +54,6 @@ namespace blink {
 Navigator::Navigator(LocalFrame* frame)
     : DOMWindowProperty(frame)
 {
-    ScriptWrappable::init(this);
 }
 
 Navigator::~Navigator()
@@ -154,9 +153,12 @@ Vector<String> Navigator::languages()
 
 void Navigator::trace(Visitor* visitor)
 {
+#if ENABLE(OILPAN)
     visitor->trace(m_plugins);
     visitor->trace(m_mimeTypes);
-    WillBeHeapSupplementable<Navigator>::trace(visitor);
+    HeapSupplementable<Navigator>::trace(visitor);
+#endif
+    DOMWindowProperty::trace(visitor);
 }
 
 } // namespace blink