Title: [143297] trunk/Source/WebKit2
- Revision
- 143297
- Author
- [email protected]
- Date
- 2013-02-18 22:57:53 -0800 (Mon, 18 Feb 2013)
Log Message
[WK2][EFL] Stop using internal C++ API in ewk_error
https://bugs.webkit.org/show_bug.cgi?id=108796
Patch by Christophe Dumez <[email protected]> on 2013-02-18
Reviewed by Benjamin Poulain.
Stop using internal C++ API in ewk_error and use C API instead of avoid
violating API layering.
* UIProcess/API/efl/ewk_error.cpp:
(EwkError::domain):
(EwkError::isCancellation):
(ewk_error_type_get):
* UIProcess/API/efl/ewk_error_private.h:
(EwkError):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (143296 => 143297)
--- trunk/Source/WebKit2/ChangeLog 2013-02-19 06:39:50 UTC (rev 143296)
+++ trunk/Source/WebKit2/ChangeLog 2013-02-19 06:57:53 UTC (rev 143297)
@@ -1,3 +1,20 @@
+2013-02-18 Christophe Dumez <[email protected]>
+
+ [WK2][EFL] Stop using internal C++ API in ewk_error
+ https://bugs.webkit.org/show_bug.cgi?id=108796
+
+ Reviewed by Benjamin Poulain.
+
+ Stop using internal C++ API in ewk_error and use C API instead of avoid
+ violating API layering.
+
+ * UIProcess/API/efl/ewk_error.cpp:
+ (EwkError::domain):
+ (EwkError::isCancellation):
+ (ewk_error_type_get):
+ * UIProcess/API/efl/ewk_error_private.h:
+ (EwkError):
+
2013-02-18 Simon Fraser <[email protected]>
Clean up the boolean argument to visibleContentRect
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_error.cpp (143296 => 143297)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_error.cpp 2013-02-19 06:39:50 UTC (rev 143296)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_error.cpp 2013-02-19 06:57:53 UTC (rev 143297)
@@ -27,14 +27,12 @@
#include "ewk_error.h"
#include "ErrorsEfl.h"
+#include "WKError.h"
#include "WKString.h"
#include "WKURL.h"
#include "ewk_error_private.h"
-#include <WKAPICast.h>
-#include <wtf/text/CString.h>
using namespace WebCore;
-using namespace WebKit;
EwkError::EwkError(WKErrorRef errorRef)
: m_wkError(errorRef)
@@ -52,10 +50,9 @@
return m_description;
}
-String EwkError::domain() const
+WKRetainPtr<WKStringRef> EwkError::domain() const
{
- WKRetainPtr<WKStringRef> wkDomain(AdoptWK, WKErrorCopyDomain(m_wkError.get()));
- return toWTFString(wkDomain.get());
+ return adoptWK(WKErrorCopyDomain(m_wkError.get()));
}
int EwkError::errorCode() const
@@ -65,25 +62,26 @@
bool EwkError::isCancellation() const
{
- return toImpl(m_wkError.get())->platformError().isCancellation();
+ return WKStringIsEqualToUTF8CString(domain().get(), errorDomainNetwork) && errorCode() == NetworkErrorCancelled;
}
Ewk_Error_Type ewk_error_type_get(const Ewk_Error* error)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(error, EWK_ERROR_TYPE_NONE);
- String errorDomain = error->domain();
+ WKRetainPtr<WKStringRef> wkErrorDomain = error->domain();
- if (errorDomain == errorDomainNetwork)
+ if (WKStringIsEqualToUTF8CString(wkErrorDomain.get(), errorDomainNetwork))
return EWK_ERROR_TYPE_NETWORK;
- if (errorDomain == errorDomainPolicy)
+ if (WKStringIsEqualToUTF8CString(wkErrorDomain.get(), errorDomainPolicy))
return EWK_ERROR_TYPE_POLICY;
- if (errorDomain == errorDomainPlugin)
+ if (WKStringIsEqualToUTF8CString(wkErrorDomain.get(), errorDomainPlugin))
return EWK_ERROR_TYPE_PLUGIN;
- if (errorDomain == errorDomainDownload)
+ if (WKStringIsEqualToUTF8CString(wkErrorDomain.get(), errorDomainDownload))
return EWK_ERROR_TYPE_DOWNLOAD;
- if (errorDomain == errorDomainPrint)
+ if (WKStringIsEqualToUTF8CString(wkErrorDomain.get(), errorDomainPrint))
return EWK_ERROR_TYPE_PRINT;
+
return EWK_ERROR_TYPE_INTERNAL;
}
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_error_private.h (143296 => 143297)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_error_private.h 2013-02-19 06:39:50 UTC (rev 143296)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_error_private.h 2013-02-19 06:57:53 UTC (rev 143297)
@@ -27,10 +27,9 @@
#define ewk_error_private_h
#include "WKEinaSharedString.h"
-#include <WKError.h>
#include <WKRetainPtr.h>
+#include <WebKit2/WKBase.h>
#include <wtf/PassOwnPtr.h>
-#include <wtf/text/WTFString.h>
class EwkError {
public:
@@ -44,7 +43,7 @@
const char* url() const;
const char* description() const;
- String domain() const;
+ WKRetainPtr<WKStringRef> domain() const;
int errorCode() const;
bool isCancellation() const;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
