Changeset 143258 in webkit

Timestamp:

Feb 18, 2013 1:36:57 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL][WK2] Use C API inside ewk_security_origin
​https://bugs.webkit.org/show_bug.cgi?id=107923

Patch by Christophe Dumez <Christophe Dumez> on 2013-02-18
Reviewed by Alexey Proskuryakov.

Use C API inside ewk_security_origin instead of accessing
directly internal C++ classes, to avoid breaking API
layering.

• UIProcess/API/efl/EwkView.cpp:

(EwkView::enterFullScreen):

• UIProcess/API/efl/ewk_security_origin.cpp:

(EwkSecurityOrigin::EwkSecurityOrigin):

• UIProcess/API/efl/ewk_security_origin_private.h:

(EwkSecurityOrigin::create):
(EwkSecurityOrigin):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/efl/EwkView.cpp (modified) (1 diff)
• UIProcess/API/efl/ewk_security_origin.cpp (modified) (2 diffs)
• UIProcess/API/efl/ewk_security_origin_private.h (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-02-18  Christophe Dumez  <christophe.dumez@intel.com>
+
+        [EFL][WK2] Use C API inside ewk_security_origin
+        https://bugs.webkit.org/show_bug.cgi?id=107923
+
+        Reviewed by Alexey Proskuryakov.
+
+        Use C API inside ewk_security_origin instead of accessing
+        directly internal C++ classes, to avoid breaking API
+        layering.
+
+        * UIProcess/API/efl/EwkView.cpp:
+        (EwkView::enterFullScreen):
+        * UIProcess/API/efl/ewk_security_origin.cpp:
+        (EwkSecurityOrigin::EwkSecurityOrigin):
+        * UIProcess/API/efl/ewk_security_origin_private.h:
+        (EwkSecurityOrigin::create):
+        (EwkSecurityOrigin):
+
 2013-01-04  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp

@@ -617 +617 @@
     Ewk_View_Smart_Data* sd = smartData();
 
-    RefPtr<EwkSecurityOrigin> origin = EwkSecurityOrigin::create(KURL(ParsedURLString, String::fromUTF8(m_url)));
+    RefPtr<EwkSecurityOrigin> origin = EwkSecurityOrigin::create(m_url);
 
     if (!sd->api->fullscreen_enter || !sd->api->fullscreen_enter(sd, origin.get())) {

trunk/Source/WebKit2/UIProcess/API/efl/ewk_security_origin.cpp

@@ -29 +29 @@
 #include "WKAPICast.h"
 #include "WKSecurityOrigin.h"
-#include "WebSecurityOrigin.h"
+#include "WKString.h"
 #include "ewk_security_origin_private.h"
 #include <WebCore/SecurityOrigin.h>
@@ -42 +42 @@
 { }
 
-EwkSecurityOrigin::EwkSecurityOrigin(const KURL& url)
-    : m_wkOrigin(AdoptWK, toAPI(WebSecurityOrigin::create(SecurityOrigin::create(url)).leakRef()))
+EwkSecurityOrigin::EwkSecurityOrigin(const char* url)
+    : m_wkOrigin(AdoptWK, WKSecurityOriginCreateFromString(adoptWK(WKStringCreateWithUTF8CString(url)).get()))
     , m_host(AdoptWK, WKSecurityOriginCopyHost(m_wkOrigin.get()))
     , m_protocol(AdoptWK, WKSecurityOriginCopyProtocol(m_wkOrigin.get()))

trunk/Source/WebKit2/UIProcess/API/efl/ewk_security_origin_private.h

@@ -30 +30 @@
 #include "WKSecurityOrigin.h"
 #include "ewk_object_private.h"
-#include <WebCore/KURL.h>
 #include <WebKit2/WKBase.h>
 #include <wtf/PassRefPtr.h>
@@ -43 +42 @@
     }
 
-    static PassRefPtr<EwkSecurityOrigin> create(const WebCore::KURL& url)
+    static PassRefPtr<EwkSecurityOrigin> create(const char* url)
     {
         return adoptRef(new EwkSecurityOrigin(url));
@@ -54 +53 @@
 private:
     explicit EwkSecurityOrigin(WKSecurityOriginRef originRef);
-    explicit EwkSecurityOrigin(const WebCore::KURL& url);
+    explicit EwkSecurityOrigin(const char* url);
 
     WKRetainPtr<WKSecurityOriginRef> m_wkOrigin;