Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / dom / ContextFeatures.cpp

diff --git a/src/third_party/WebKit/Source/core/dom/ContextFeatures.cpp b/src/third_party/WebKit/Source/core/dom/ContextFeatures.cpp
index 2e17b30..12acd40 100644 (file)
--- a/src/third_party/WebKit/Source/core/dom/ContextFeatures.cpp
+++ b/src/third_party/WebKit/Source/core/dom/ContextFeatures.cpp
@@ -31,7 +31,7 @@
 #include "core/page/Page.h"
 #include "platform/RuntimeEnabledFeatures.h"
 
-namespace WebCore {
+namespace blink {
 
 PassOwnPtr<ContextFeaturesClient> ContextFeaturesClient::empty()
 {
@@ -45,21 +45,10 @@ const char* ContextFeatures::supplementName()
 
 ContextFeatures* ContextFeatures::defaultSwitch()
 {
-#if ENABLE(OILPAN)
-    DEFINE_STATIC_LOCAL(Persistent<ContextFeatures>, instance, (ContextFeatures::create(ContextFeaturesClient::empty())));
-#else
-    DEFINE_STATIC_REF(ContextFeatures, instance, (ContextFeatures::create(ContextFeaturesClient::empty())));
-#endif
+    DEFINE_STATIC_REF_WILL_BE_PERSISTENT(ContextFeatures, instance, (ContextFeatures::create(ContextFeaturesClient::empty())));
     return instance;
 }
 
-bool ContextFeatures::dialogElementEnabled(Document* document)
-{
-    if (!document)
-        return RuntimeEnabledFeatures::dialogElementEnabled();
-    return document->contextFeatures().isEnabled(document, DialogElement, RuntimeEnabledFeatures::dialogElementEnabled());
-}
-
 bool ContextFeatures::pagePopupEnabled(Document* document)
 {
     if (!document)