X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2FWebKit%2FSource%2Fcore%2Fdom%2FContextFeatures.cpp;h=12acd4029a01afa2d3a0e2dd74144d704ca07b04;hb=4a1a0bdd01eef90b0826a0e761d3379d3715c10f;hp=2e17b30dace963d1f47d6dc178d810650c775c43;hpb=b1be5ca53587d23e7aeb77b26861fdc0a181ffd8;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

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
--- 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)