diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-09 12:15:52 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-09 12:16:06 +0100 |
commit | de4f791e30be4e4239b381c11745ffa4d87ddb8b (patch) | |
tree | 885e3a5d6670828b454cf676b4d42f78e28b1f0e /Source/WebKit2/UIProcess/API | |
parent | b022df48697d40cdabdeafb2c29bb14fe489b6fe (diff) | |
download | qtwebkit-de4f791e30be4e4239b381c11745ffa4d87ddb8b.tar.gz |
Imported WebKit commit e2c32e2f53e02d388e70b9db88b91d8d9d28fc84 (http://svn.webkit.org/repository/webkit/trunk@133952)
Revert back to an older snapshot that should build on ARM
Diffstat (limited to 'Source/WebKit2/UIProcess/API')
9 files changed, 5 insertions, 60 deletions
diff --git a/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp b/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp index 9d8732ec8..13812a649 100644 --- a/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp +++ b/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp @@ -47,7 +47,6 @@ #include "ewk_popup_menu_item_private.h" #include "ewk_popup_menu_private.h" #include "ewk_private.h" -#include "ewk_security_origin_private.h" #include "ewk_settings_private.h" #include "ewk_view.h" #include "ewk_view_private.h" @@ -338,9 +337,7 @@ void EwkViewImpl::enterFullScreen() { Ewk_View_Smart_Data* sd = smartData(); - RefPtr<EwkSecurityOrigin> origin = EwkSecurityOrigin::create(KURL(ParsedURLString, String::fromUTF8(m_url))); - - if (!sd->api->fullscreen_enter || !sd->api->fullscreen_enter(sd, origin.get())) { + if (!sd->api->fullscreen_enter || !sd->api->fullscreen_enter(sd)) { Ecore_Evas* ecoreEvas = ecore_evas_ecore_evas_get(sd->base.evas); ecore_evas_fullscreen_set(ecoreEvas, true); } diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_security_origin.cpp b/Source/WebKit2/UIProcess/API/efl/ewk_security_origin.cpp index 60d8e39f8..35061260c 100644 --- a/Source/WebKit2/UIProcess/API/efl/ewk_security_origin.cpp +++ b/Source/WebKit2/UIProcess/API/efl/ewk_security_origin.cpp @@ -28,11 +28,8 @@ #include "WKAPICast.h" #include "WKSecurityOrigin.h" -#include "WebSecurityOrigin.h" #include "ewk_security_origin_private.h" -#include <WebCore/SecurityOrigin.h> -using namespace WebCore; using namespace WebKit; EwkSecurityOrigin::EwkSecurityOrigin(WKSecurityOriginRef originRef) @@ -41,12 +38,6 @@ EwkSecurityOrigin::EwkSecurityOrigin(WKSecurityOriginRef originRef) , m_protocol(AdoptWK, WKSecurityOriginCopyProtocol(originRef)) { } -EwkSecurityOrigin::EwkSecurityOrigin(const KURL& url) - : m_wkOrigin(AdoptWK, toAPI(WebSecurityOrigin::create(SecurityOrigin::create(url)).leakRef())) - , m_host(AdoptWK, WKSecurityOriginCopyHost(m_wkOrigin.get())) - , m_protocol(AdoptWK, WKSecurityOriginCopyProtocol(m_wkOrigin.get())) -{ } - const char* EwkSecurityOrigin::host() const { return m_host; diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_security_origin_private.h b/Source/WebKit2/UIProcess/API/efl/ewk_security_origin_private.h index 6009c6e55..a8a39a499 100644 --- a/Source/WebKit2/UIProcess/API/efl/ewk_security_origin_private.h +++ b/Source/WebKit2/UIProcess/API/efl/ewk_security_origin_private.h @@ -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,18 +41,12 @@ public: return adoptRef(new EwkSecurityOrigin(originRef)); } - static PassRefPtr<EwkSecurityOrigin> create(const WebCore::KURL& url) - { - return adoptRef(new EwkSecurityOrigin(url)); - } - const char* host() const; const char* protocol() const; uint32_t port() const; private: explicit EwkSecurityOrigin(WKSecurityOriginRef originRef); - explicit EwkSecurityOrigin(const WebCore::KURL& url); WKRetainPtr<WKSecurityOriginRef> m_wkOrigin; WKEinaSharedString m_host; diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_settings.cpp b/Source/WebKit2/UIProcess/API/efl/ewk_settings.cpp index f704ea378..96a321038 100644 --- a/Source/WebKit2/UIProcess/API/efl/ewk_settings.cpp +++ b/Source/WebKit2/UIProcess/API/efl/ewk_settings.cpp @@ -225,7 +225,7 @@ void ewk_settings_continuous_spell_checking_enabled_set(Eina_Bool enable) WKTextCheckerContinuousSpellCheckingEnabledStateChanged(enable); // Sets the default language if user didn't specify any. - if (enable && !Ewk_Text_Checker::hasDictionary()) + if (enable && Ewk_Text_Checker::loadedSpellCheckingLanguages().isEmpty()) spellCheckingLanguagesSet(Vector<String>()); if (ewkTextCheckerSettings.onContinuousSpellChecking) diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_text_checker.cpp b/Source/WebKit2/UIProcess/API/efl/ewk_text_checker.cpp index ce546d56b..e15b8fc1a 100644 --- a/Source/WebKit2/UIProcess/API/efl/ewk_text_checker.cpp +++ b/Source/WebKit2/UIProcess/API/efl/ewk_text_checker.cpp @@ -162,11 +162,6 @@ Vector<String> loadedSpellCheckingLanguages() return textCheckerEnchant()->loadedSpellCheckingLanguages(); } -bool hasDictionary() -{ - return textCheckerEnchant()->hasDictionary(); -} - /** * Initializes spellcheck feature. * diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_text_checker_private.h b/Source/WebKit2/UIProcess/API/efl/ewk_text_checker_private.h index 6c4730e2e..462d314f4 100644 --- a/Source/WebKit2/UIProcess/API/efl/ewk_text_checker_private.h +++ b/Source/WebKit2/UIProcess/API/efl/ewk_text_checker_private.h @@ -39,7 +39,6 @@ void initialize(); Vector<String> availableSpellCheckingLanguages(); void updateSpellCheckingLanguages(const Vector<String>& languages); Vector<String> loadedSpellCheckingLanguages(); -bool hasDictionary(); } diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp b/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp index 9056e1cba..d214ed692 100644 --- a/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp +++ b/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp @@ -39,7 +39,6 @@ #include "WKRetainPtr.h" #include "WKString.h" #include "WebContext.h" -#include "WebFullScreenManagerProxy.h" #include "WebPageGroup.h" #include "WebPreferences.h" #include "ewk_back_forward_list_private.h" @@ -908,16 +907,3 @@ Ewk_Pagination_Mode ewk_view_pagination_mode_get(const Evas_Object* ewkView) return static_cast<Ewk_Pagination_Mode>(impl->page()->paginationMode()); } - -Eina_Bool ewk_view_fullscreen_exit(Evas_Object* ewkView) -{ -#if ENABLE(FULLSCREEN_API) - EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false); - - impl->page()->fullScreenManager()->requestExitFullScreen(); - - return true; -#else - return false; -#endif -} diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_view.h b/Source/WebKit2/UIProcess/API/efl/ewk_view.h index 85b976291..87f36c14e 100644 --- a/Source/WebKit2/UIProcess/API/efl/ewk_view.h +++ b/Source/WebKit2/UIProcess/API/efl/ewk_view.h @@ -89,7 +89,6 @@ #include "ewk_intent.h" #include "ewk_popup_menu.h" #include "ewk_resource.h" -#include "ewk_security_origin.h" #include "ewk_settings.h" #include "ewk_touch.h" #include "ewk_url_request.h" @@ -122,7 +121,7 @@ struct Ewk_View_Smart_Class { // - if overridden, have to call parent method if desired Eina_Bool (*focus_in)(Ewk_View_Smart_Data *sd); Eina_Bool (*focus_out)(Ewk_View_Smart_Data *sd); - Eina_Bool (*fullscreen_enter)(Ewk_View_Smart_Data *sd, Ewk_Security_Origin *origin); + Eina_Bool (*fullscreen_enter)(Ewk_View_Smart_Data *sd); Eina_Bool (*fullscreen_exit)(Ewk_View_Smart_Data *sd); Eina_Bool (*mouse_wheel)(Ewk_View_Smart_Data *sd, const Evas_Event_Mouse_Wheel *ev); Eina_Bool (*mouse_down)(Ewk_View_Smart_Data *sd, const Evas_Event_Mouse_Down *ev); @@ -801,15 +800,6 @@ EAPI Eina_Bool ewk_view_pagination_mode_set(Evas_Object *o, Ewk_Pagination_Mode */ EAPI Ewk_Pagination_Mode ewk_view_pagination_mode_get(const Evas_Object *o); -/** - * Exit fullscreen mode. - * - * @param o view object where to exit fullscreen - * - * @return @c EINA_TRUE if successful, @c EINA_FALSE otherwise - */ -EAPI Eina_Bool ewk_view_fullscreen_exit(Evas_Object *o); - #ifdef __cplusplus } #endif diff --git a/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp b/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp index ed5bbb1bb..199970d29 100644 --- a/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp +++ b/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp @@ -242,13 +242,7 @@ TEST_F(EWK2UnitTestBase, ewk_view_mouse_events_enabled) ASSERT_FALSE(ewk_view_mouse_events_enabled_get(webView())); } -static Eina_Bool fullScreenCallback(Ewk_View_Smart_Data* smartData, Ewk_Security_Origin*) -{ - fullScreenCallbackCalled = true; - return false; -} - -static Eina_Bool fullScreenExitCallback(Ewk_View_Smart_Data* smartData) +static Eina_Bool fullScreenCallback(Ewk_View_Smart_Data* smartData) { fullScreenCallbackCalled = true; return false; @@ -284,7 +278,7 @@ TEST_F(EWK2UnitTestBase, ewk_view_full_screen_exit) "}</script></head>" "<body><div id=\"fullscreen\" style=\"width:100px; height:100px\" onclick=\"makeFullScreenAndExit()\"></div></body>"; - ewkViewClass()->fullscreen_exit = fullScreenExitCallback; + ewkViewClass()->fullscreen_exit = fullScreenCallback; ewk_view_html_string_load(webView(), fullscreenHTML, "file:///", 0); ASSERT_TRUE(waitUntilLoadFinished()); |