Diff
Modified: trunk/Source/WebCore/ChangeLog (124865 => 124866)
--- trunk/Source/WebCore/ChangeLog 2012-08-07 08:16:37 UTC (rev 124865)
+++ trunk/Source/WebCore/ChangeLog 2012-08-07 08:33:53 UTC (rev 124866)
@@ -1,3 +1,23 @@
+2012-08-07 Mikhail Pozdnyakov <[email protected]>
+
+ CUSTOM_SCHEME_HANDLER flag should depend on REGISTER_PROTOCOL_HANDLER
+ https://bugs.webkit.org/show_bug.cgi?id=93081
+
+ Reviewed by Adam Barth.
+
+ CUSTOM_SCHEME_HANDLER #if guards are enclosed in the REGISTER_PROTOCOL_HANDLER guards.
+ The whole NavigatorRegisterProtocolHandler interface is conditional on REGISTER_PROTOCOL_HANDLER
+ CUSTOM_SCHEME_HANDLER-specific methods only are conditional on CUSTOM_SCHEME_HANDLER.
+
+ No new tests. No new functionality is added.
+
+ * Modules/protocolhandler/NavigatorRegisterProtocolHandler.cpp:
+ (WebCore::NavigatorRegisterProtocolHandler::registerProtocolHandler):
+ * Modules/protocolhandler/NavigatorRegisterProtocolHandler.h:
+ (NavigatorRegisterProtocolHandler):
+ * Modules/protocolhandler/NavigatorRegisterProtocolHandler.idl:
+ * Modules/protocolhandler/RegisterProtocolHandlerClient.h:
+
2012-08-07 Xingnan Wang <[email protected]>
IndexedDB: Size the Vector in encodeInt/encodeVarInt/encodeString
Modified: trunk/Source/WebCore/Modules/protocolhandler/NavigatorRegisterProtocolHandler.cpp (124865 => 124866)
--- trunk/Source/WebCore/Modules/protocolhandler/NavigatorRegisterProtocolHandler.cpp 2012-08-07 08:16:37 UTC (rev 124865)
+++ trunk/Source/WebCore/Modules/protocolhandler/NavigatorRegisterProtocolHandler.cpp 2012-08-07 08:33:53 UTC (rev 124866)
@@ -27,7 +27,7 @@
#include "config.h"
#include "NavigatorRegisterProtocolHandler.h"
-#if ENABLE(REGISTER_PROTOCOL_HANDLER) || ENABLE(CUSTOM_SCHEME_HANDLER)
+#if ENABLE(REGISTER_PROTOCOL_HANDLER)
#include "Document.h"
#include "ExceptionCode.h"
@@ -124,7 +124,6 @@
return adoptRef(new NavigatorRegisterProtocolHandler(client));
}
-#if ENABLE(REGISTER_PROTOCOL_HANDLER)
void NavigatorRegisterProtocolHandler::registerProtocolHandler(Navigator* navigator, const String& scheme, const String& url, const String& title, ExceptionCode& ec)
{
if (!navigator->frame())
@@ -144,7 +143,6 @@
NavigatorRegisterProtocolHandler::from(navigator->frame()->page())->client()->registerProtocolHandler(scheme, baseURL, url, navigator->frame()->displayStringModifiedByEncoding(title));
}
-#endif
#if ENABLE(CUSTOM_SCHEME_HANDLER)
static String customHandlersStateString(const RegisterProtocolHandlerClient::CustomHandlersState state)
@@ -216,5 +214,5 @@
} // namespace WebCore
-#endif // ENABLE(REGISTER_PROTOCOL_HANDLER) || ENABLE(CUSTOM_SCHEME_HANDLER)
+#endif // ENABLE(REGISTER_PROTOCOL_HANDLER)
Modified: trunk/Source/WebCore/Modules/protocolhandler/NavigatorRegisterProtocolHandler.h (124865 => 124866)
--- trunk/Source/WebCore/Modules/protocolhandler/NavigatorRegisterProtocolHandler.h 2012-08-07 08:16:37 UTC (rev 124865)
+++ trunk/Source/WebCore/Modules/protocolhandler/NavigatorRegisterProtocolHandler.h 2012-08-07 08:33:53 UTC (rev 124866)
@@ -27,7 +27,7 @@
#ifndef NavigatorRegisterProtocolHandler_h
#define NavigatorRegisterProtocolHandler_h
-#if ENABLE(REGISTER_PROTOCOL_HANDLER) || ENABLE(CUSTOM_SCHEME_HANDLER)
+#if ENABLE(REGISTER_PROTOCOL_HANDLER)
#include "RefCountedSupplement.h"
#include "RegisterProtocolHandlerClient.h"
@@ -48,9 +48,7 @@
static const AtomicString& supplementName();
static NavigatorRegisterProtocolHandler* from(Page*);
-#if ENABLE(REGISTER_PROTOCOL_HANDLER)
static void registerProtocolHandler(Navigator*, const String& scheme, const String& url, const String& title, ExceptionCode&);
-#endif
#if ENABLE(CUSTOM_SCHEME_HANDLER)
static String isProtocolHandlerRegistered(Navigator*, const String& scheme, const String& url, ExceptionCode&);
@@ -71,6 +69,6 @@
} // namespace WebCore
-#endif // ENABLE(REGISTER_PROTOCOL_HANDLER) || ENABLE(CUSTOM_SCHEME_HANDLER)
+#endif // ENABLE(REGISTER_PROTOCOL_HANDLER)
#endif // NavigatorRegisterProtocolHandler_h
Modified: trunk/Source/WebCore/Modules/protocolhandler/NavigatorRegisterProtocolHandler.idl (124865 => 124866)
--- trunk/Source/WebCore/Modules/protocolhandler/NavigatorRegisterProtocolHandler.idl 2012-08-07 08:16:37 UTC (rev 124865)
+++ trunk/Source/WebCore/Modules/protocolhandler/NavigatorRegisterProtocolHandler.idl 2012-08-07 08:33:53 UTC (rev 124866)
@@ -25,9 +25,9 @@
] NavigatorRegisterProtocolHandler {
[Conditional=REGISTER_PROTOCOL_HANDLER] void registerProtocolHandler(in DOMString scheme, in DOMString url, in DOMString title)
raises(DOMException);
- [Conditional=CUSTOM_SCHEME_HANDLER] DOMString isProtocolHandlerRegistered(in DOMString scheme, in DOMString url)
+ [Conditional=REGISTER_PROTOCOL_HANDLER&CUSTOM_SCHEME_HANDLER] DOMString isProtocolHandlerRegistered(in DOMString scheme, in DOMString url)
raises(DOMException);
- [Conditional=CUSTOM_SCHEME_HANDLER] void unregisterProtocolHandler(in DOMString scheme, in DOMString url)
+ [Conditional=REGISTER_PROTOCOL_HANDLER&CUSTOM_SCHEME_HANDLER] void unregisterProtocolHandler(in DOMString scheme, in DOMString url)
raises(DOMException);
};
Modified: trunk/Source/WebCore/Modules/protocolhandler/RegisterProtocolHandlerClient.h (124865 => 124866)
--- trunk/Source/WebCore/Modules/protocolhandler/RegisterProtocolHandlerClient.h 2012-08-07 08:16:37 UTC (rev 124865)
+++ trunk/Source/WebCore/Modules/protocolhandler/RegisterProtocolHandlerClient.h 2012-08-07 08:33:53 UTC (rev 124866)
@@ -26,7 +26,7 @@
#ifndef RegisterProtocolHandlerClient_h
#define RegisterProtocolHandlerClient_h
-#if ENABLE(REGISTER_PROTOCOL_HANDLER) || ENABLE(CUSTOM_SCHEME_HANDLER)
+#if ENABLE(REGISTER_PROTOCOL_HANDLER)
#include <wtf/text/WTFString.h>
@@ -37,10 +37,7 @@
class RegisterProtocolHandlerClient {
public:
virtual ~RegisterProtocolHandlerClient() { }
-
-#if ENABLE(REGISTER_PROTOCOL_HANDLER)
virtual void registerProtocolHandler(const String& scheme, const String& baseURL, const String& url, const String& title) = 0;
-#endif
#if ENABLE(CUSTOM_SCHEME_HANDLER)
enum CustomHandlersState {
@@ -58,5 +55,5 @@
}
-#endif
+#endif // ENABLE(REGISTER_PROTOCOL_HANDLER)
#endif // RegisterProtocolHandlerClient_h
Modified: trunk/Source/WebKit/ChangeLog (124865 => 124866)
--- trunk/Source/WebKit/ChangeLog 2012-08-07 08:16:37 UTC (rev 124865)
+++ trunk/Source/WebKit/ChangeLog 2012-08-07 08:33:53 UTC (rev 124866)
@@ -1,3 +1,14 @@
+2012-08-07 Mikhail Pozdnyakov <[email protected]>
+
+ CUSTOM_SCHEME_HANDLER flag should depend on REGISTER_PROTOCOL_HANDLER
+ https://bugs.webkit.org/show_bug.cgi?id=93081
+
+ Reviewed by Adam Barth.
+
+ Modified PlatformEfl.cmake so that CUSTOM_SCHEME_HANDLER flag cannot act without REGISTER_PROTOCOL_HANDLER being set.
+
+ * PlatformEfl.cmake:
+
2012-08-01 Antonio Gomes <[email protected]>
[BlackBerry] Implement InRegionScroller class as a in-region scroll controller
Modified: trunk/Source/WebKit/PlatformEfl.cmake (124865 => 124866)
--- trunk/Source/WebKit/PlatformEfl.cmake 2012-08-07 08:16:37 UTC (rev 124865)
+++ trunk/Source/WebKit/PlatformEfl.cmake 2012-08-07 08:33:53 UTC (rev 124866)
@@ -88,7 +88,7 @@
)
ENDIF ()
-IF (ENABLE_REGISTER_PROTOCOL_HANDLER OR ENABLE_CUSTOM_SCHEME_HANDLER)
+IF (ENABLE_REGISTER_PROTOCOL_HANDLER)
LIST(APPEND WebKit_INCLUDE_DIRECTORIES
"${WEBCORE_DIR}/Modules/protocolhandler"
)
Modified: trunk/Source/WebKit/efl/ChangeLog (124865 => 124866)
--- trunk/Source/WebKit/efl/ChangeLog 2012-08-07 08:16:37 UTC (rev 124865)
+++ trunk/Source/WebKit/efl/ChangeLog 2012-08-07 08:33:53 UTC (rev 124866)
@@ -1,3 +1,21 @@
+2012-08-07 Mikhail Pozdnyakov <[email protected]>
+
+ CUSTOM_SCHEME_HANDLER flag should depend on REGISTER_PROTOCOL_HANDLER
+ https://bugs.webkit.org/show_bug.cgi?id=93081
+
+ Reviewed by Adam Barth.
+
+ CUSTOM_SCHEME_HANDLER #if guards are enclosed in the REGISTER_PROTOCOL_HANDLER guards.
+
+ * WebCoreSupport/RegisterProtocolHandlerClientEfl.cpp:
+ (WebCore::RegisterProtocolHandlerClientEfl::registerProtocolHandler):
+ * WebCoreSupport/RegisterProtocolHandlerClientEfl.h:
+ * ewk/ewk_custom_handler.cpp:
+ (ewk_custom_handler_register_protocol_handler):
+ * ewk/ewk_custom_handler_private.h:
+ * ewk/ewk_view.cpp:
+ (_ewk_view_priv_new):
+
2012-08-06 Mikhail Pozdnyakov <[email protected]>
[EFL] [GTK] Register Protocol Handler Client is never deleted
Modified: trunk/Source/WebKit/efl/WebCoreSupport/RegisterProtocolHandlerClientEfl.cpp (124865 => 124866)
--- trunk/Source/WebKit/efl/WebCoreSupport/RegisterProtocolHandlerClientEfl.cpp 2012-08-07 08:16:37 UTC (rev 124865)
+++ trunk/Source/WebKit/efl/WebCoreSupport/RegisterProtocolHandlerClientEfl.cpp 2012-08-07 08:33:53 UTC (rev 124866)
@@ -28,7 +28,7 @@
#include "config.h"
#include "RegisterProtocolHandlerClientEfl.h"
-#if ENABLE(REGISTER_PROTOCOL_HANDLER) || ENABLE(CUSTOM_SCHEME_HANDLER)
+#if ENABLE(REGISTER_PROTOCOL_HANDLER)
#include "ewk_custom_handler_private.h"
#include <wtf/text/CString.h>
@@ -63,7 +63,6 @@
{
}
-#if ENABLE(REGISTER_PROTOCOL_HANDLER)
void RegisterProtocolHandlerClientEfl::registerProtocolHandler(const String& scheme, const String& baseURL, const String& url, const String& title)
{
Ewk_Custom_Handler_Data* data = "" scheme.utf8().data(), baseURL.utf8().data(), url.utf8().data());
@@ -72,7 +71,6 @@
eina_stringshare_del(data->title);
customHandlerDataDelete(data);
}
-#endif
#if ENABLE(CUSTOM_SCHEME_HANDLER)
RegisterProtocolHandlerClient::CustomHandlersState RegisterProtocolHandlerClientEfl::isProtocolHandlerRegistered(const String& scheme, const String& baseURL, const String& url)
@@ -94,4 +92,4 @@
}
-#endif // ENABLE(REGISTER_PROTOCOL_HANDLER) || ENABLE(CUSTOM_SCHEME_HANDLER)
+#endif // ENABLE(REGISTER_PROTOCOL_HANDLER)
Modified: trunk/Source/WebKit/efl/WebCoreSupport/RegisterProtocolHandlerClientEfl.h (124865 => 124866)
--- trunk/Source/WebKit/efl/WebCoreSupport/RegisterProtocolHandlerClientEfl.h 2012-08-07 08:16:37 UTC (rev 124865)
+++ trunk/Source/WebKit/efl/WebCoreSupport/RegisterProtocolHandlerClientEfl.h 2012-08-07 08:33:53 UTC (rev 124866)
@@ -28,7 +28,7 @@
#ifndef RegisterProtocolHandlerClientEfl_h
#define RegisterProtocolHandlerClientEfl_h
-#if ENABLE(REGISTER_PROTOCOL_HANDLER) || ENABLE(CUSTOM_SCHEME_HANDLER)
+#if ENABLE(REGISTER_PROTOCOL_HANDLER)
#include "RegisterProtocolHandlerClient.h"
#include <wtf/PassOwnPtr.h>
@@ -39,10 +39,7 @@
static PassOwnPtr<RegisterProtocolHandlerClientEfl> create(Evas_Object* view);
~RegisterProtocolHandlerClientEfl() { }
-
-#if ENABLE(REGISTER_PROTOCOL_HANDLER)
virtual void registerProtocolHandler(const String& scheme, const String& baseURL, const String& url, const String& title);
-#endif
#if ENABLE(CUSTOM_SCHEME_HANDLER)
virtual CustomHandlersState isProtocolHandlerRegistered(const String& scheme, const String& baseURL, const String& url);
Modified: trunk/Source/WebKit/efl/ewk/ewk_custom_handler.cpp (124865 => 124866)
--- trunk/Source/WebKit/efl/ewk/ewk_custom_handler.cpp 2012-08-07 08:16:37 UTC (rev 124865)
+++ trunk/Source/WebKit/efl/ewk/ewk_custom_handler.cpp 2012-08-07 08:33:53 UTC (rev 124866)
@@ -35,7 +35,6 @@
evas_object_smart_callback_call(data->ewkView, "protocolhandler,registration,requested", data);
return true;
}
-#endif
#if ENABLE(CUSTOM_SCHEME_HANDLER)
/**
@@ -68,4 +67,6 @@
evas_object_smart_callback_call(data->ewkView, "protocolhandler,unregistration,requested", data);
return true;
}
-#endif
+
+#endif // ENABLE(CUSTOM_SCHEME_HANDLER)
+#endif // ENABLE(REGISTER_PROTOCOL_HANDLER)
Modified: trunk/Source/WebKit/efl/ewk/ewk_custom_handler_private.h (124865 => 124866)
--- trunk/Source/WebKit/efl/ewk/ewk_custom_handler_private.h 2012-08-07 08:16:37 UTC (rev 124865)
+++ trunk/Source/WebKit/efl/ewk/ewk_custom_handler_private.h 2012-08-07 08:33:53 UTC (rev 124866)
@@ -24,11 +24,11 @@
#if ENABLE(REGISTER_PROTOCOL_HANDLER)
bool ewk_custom_handler_register_protocol_handler(Ewk_Custom_Handler_Data* data);
-#endif
#if ENABLE(CUSTOM_SCHEME_HANDLER)
Ewk_Custom_Handlers_State ewk_custom_handler_is_protocol_handler_registered(Ewk_Custom_Handler_Data* data);
bool ewk_custom_handler_unregister_protocol_handler(Ewk_Custom_Handler_Data* data);
-#endif
+#endif // ENABLE(CUSTOM_SCHEME_HANDLER)
+#endif // ENABLE(REGISTER_PROTOCOL_HANDLER)
#endif // ewk_custom_handler_private_h
Modified: trunk/Source/WebKit/efl/ewk/ewk_view.cpp (124865 => 124866)
--- trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2012-08-07 08:16:37 UTC (rev 124865)
+++ trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2012-08-07 08:33:53 UTC (rev 124866)
@@ -103,7 +103,7 @@
#include "ColorChooserClient.h"
#endif
-#if ENABLE(REGISTER_PROTOCOL_HANDLER) || ENABLE(CUSTOM_SCHEME_HANDLER)
+#if ENABLE(REGISTER_PROTOCOL_HANDLER)
#include "RegisterProtocolHandlerClientEfl.h"
#endif
@@ -764,7 +764,7 @@
WebCore::provideBatteryTo(priv->page.get(), new BatteryClientEfl(smartData->self));
#endif
-#if ENABLE(REGISTER_PROTOCOL_HANDLER) || ENABLE(CUSTOM_SCHEME_HANDLER)
+#if ENABLE(REGISTER_PROTOCOL_HANDLER)
priv->registerProtocolHandlerClient = WebCore::RegisterProtocolHandlerClientEfl::create(smartData->self);
WebCore::provideRegisterProtocolHandlerTo(priv->page.get(), priv->registerProtocolHandlerClient.get());
#endif
Modified: trunk/Source/WebKit2/ChangeLog (124865 => 124866)
--- trunk/Source/WebKit2/ChangeLog 2012-08-07 08:16:37 UTC (rev 124865)
+++ trunk/Source/WebKit2/ChangeLog 2012-08-07 08:33:53 UTC (rev 124866)
@@ -1,3 +1,15 @@
+2012-08-07 Mikhail Pozdnyakov <[email protected]>
+
+ CUSTOM_SCHEME_HANDLER flag should depend on REGISTER_PROTOCOL_HANDLER
+ https://bugs.webkit.org/show_bug.cgi?id=93081
+
+ Reviewed by Adam Barth.
+
+ CUSTOM_SCHEME_HANDLER #if guards are enclosed in the REGISTER_PROTOCOL_HANDLER guards.
+
+ * WebProcess/WebCoreSupport/WebRegisterProtocolHandlerClient.h:
+ (WebRegisterProtocolHandlerClient):
+
2012-08-07 Hyerim Bae <[email protected]>
[EFL][WK2] Add ewk_view_find_client.h / cpp for wrapping WKPageSetPageFindClient.
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebRegisterProtocolHandlerClient.h (124865 => 124866)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebRegisterProtocolHandlerClient.h 2012-08-07 08:16:37 UTC (rev 124865)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebRegisterProtocolHandlerClient.h 2012-08-07 08:33:53 UTC (rev 124866)
@@ -26,6 +26,8 @@
#ifndef WebRegisterProtocolHandlerClient_h
#define WebRegisterProtocolHandlerClient_h
+#if ENABLE(REGISTER_PROTOCOL_HANDLER)
+
#include <WebCore/RegisterProtocolHandlerClient.h>
#include <wtf/text/WTFString.h>
@@ -36,9 +38,7 @@
virtual ~WebRegisterProtocolHandlerClient() { }
private:
-#if ENABLE(REGISTER_PROTOCOL_HANDLER)
virtual void registerProtocolHandler(const String& scheme, const String& baseURL, const String& url, const String& title) OVERRIDE { }
-#endif
#if ENABLE(CUSTOM_SCHEME_HANDLER)
virtual CustomHandlersState isProtocolHandlerRegistered(const String&, const String&, const String&) { return CustomHandlersDeclined; }
@@ -48,4 +48,5 @@
}
+#endif // ENABLE(REGISTER_PROTOCOL_HANDLER)
#endif // WebRegisterProtocolHandlerClient_h
