Imported WebKit commit bf0b0213bbf3886c96610020602012ca7d11b084 (http://svn.webkit.org/repository/webkit/trunk@126545)

New snapshot with clang and python build fixes

1 files changed, 6 insertions, 11 deletions

diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp b/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp
index d6453757e..71504f641 100644
--- a/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp
+++ b/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp
@@ -70,18 +70,18 @@ struct _Ewk_Context {
     WKRetainPtr<WKSoupRequestManagerRef> requestManager;
     URLSchemeHandlerMap urlSchemeHandlers;
 
-    _Ewk_Context(WKContextRef contextRef)
+    _Ewk_Context(WKRetainPtr<WKContextRef> contextRef)
         : context(contextRef)
         , cookieManager(0)
-        , requestManager(WKContextGetSoupRequestManager(contextRef))
+        , requestManager(WKContextGetSoupRequestManager(contextRef.get()))
     {
 #if ENABLE(BATTERY_STATUS)
-        WKBatteryManagerRef wkBatteryManager = WKContextGetBatteryManager(contextRef);
+        WKBatteryManagerRef wkBatteryManager = WKContextGetBatteryManager(contextRef.get());
         batteryProvider = BatteryProvider::create(wkBatteryManager);
 #endif
 
 #if ENABLE(VIBRATION)
-        WKVibrationRef wkVibrationRef = WKContextGetVibration(contextRef);
+        WKVibrationRef wkVibrationRef = WKContextGetVibration(contextRef.get());
         vibrationProvider = VibrationProvider::create(wkVibrationRef);
 #endif
 
@@ -198,16 +198,11 @@ void ewk_context_url_scheme_request_received(Ewk_Context* ewkContext, Ewk_Url_Sc
     handler.callback(schemeRequest, handler.userData);
 }
 
-static inline Ewk_Context* createDefaultEwkContext()
-{
-    return new Ewk_Context(WKContextCreate());
-}
-
 Ewk_Context* ewk_context_default_get()
 {
-    static Ewk_Context* defaultContext = createDefaultEwkContext();
+    static Ewk_Context defaultContext(adoptWK(WKContextCreate()));
 
-    return defaultContext;
+    return &defaultContext;
 }
 
 Eina_Bool ewk_context_uri_scheme_register(Ewk_Context* ewkContext, const char* scheme, Ewk_Url_Scheme_Request_Cb callback, void* userData)