[webkit-changes] [143258] trunk/Source/WebKit2

Mon, 18 Feb 2013 13:34:55 -0800

Title: [143258] trunk/Source/WebKit2
Revision
143258
Author
[email protected]
Date
2013-02-18 13:36:57 -0800 (Mon, 18 Feb 2013)

Log Message

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

Patch by Christophe Dumez <[email protected]> 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):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (143257 => 143258)


--- trunk/Source/WebKit2/ChangeLog	2013-02-18 21:25:32 UTC (rev 143257)
+++ trunk/Source/WebKit2/ChangeLog	2013-02-18 21:36:57 UTC (rev 143258)
@@ -1,3 +1,22 @@
+2013-02-18  Christophe Dumez  <[email protected]>
+
+        [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  <[email protected]>
 
         pinch-zooming webpage messes up full-screening of embedded video

Modified: trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp (143257 => 143258)


--- trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp	2013-02-18 21:25:32 UTC (rev 143257)
+++ trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp	2013-02-18 21:36:57 UTC (rev 143258)
@@ -616,7 +616,7 @@
 {
     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())) {
         Ecore_Evas* ecoreEvas = ecore_evas_ecore_evas_get(sd->base.evas);

Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_security_origin.cpp (143257 => 143258)


--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_security_origin.cpp	2013-02-18 21:25:32 UTC (rev 143257)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_security_origin.cpp	2013-02-18 21:36:57 UTC (rev 143258)
@@ -28,7 +28,7 @@
 
 #include "WKAPICast.h"
 #include "WKSecurityOrigin.h"
-#include "WebSecurityOrigin.h"
+#include "WKString.h"
 #include "ewk_security_origin_private.h"
 #include <WebCore/SecurityOrigin.h>
 
@@ -41,8 +41,8 @@
     , m_protocol(AdoptWK, WKSecurityOriginCopyProtocol(originRef))
 { }
 
-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()))
 { }

Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_security_origin_private.h (143257 => 143258)


--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_security_origin_private.h	2013-02-18 21:25:32 UTC (rev 143257)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_security_origin_private.h	2013-02-18 21:36:57 UTC (rev 143258)
@@ -29,7 +29,6 @@
 #include "WKEinaSharedString.h"
 #include "WKSecurityOrigin.h"
 #include "ewk_object_private.h"
-#include <WebCore/KURL.h>
 #include <WebKit2/WKBase.h>
 #include <wtf/PassRefPtr.h>
 
@@ -42,7 +41,7 @@
         return adoptRef(new EwkSecurityOrigin(originRef));
     }
 
-    static PassRefPtr<EwkSecurityOrigin> create(const WebCore::KURL& url)
+    static PassRefPtr<EwkSecurityOrigin> create(const char* url)
     {
         return adoptRef(new EwkSecurityOrigin(url));
     }
@@ -53,7 +52,7 @@
 
 private:
     explicit EwkSecurityOrigin(WKSecurityOriginRef originRef);
-    explicit EwkSecurityOrigin(const WebCore::KURL& url);
+    explicit EwkSecurityOrigin(const char* url);
 
     WKRetainPtr<WKSecurityOriginRef> m_wkOrigin;
     WKEinaSharedString m_host;

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to