diff options
Diffstat (limited to 'Source/WebKit/efl')
22 files changed, 363 insertions, 10 deletions
diff --git a/Source/WebKit/efl/ChangeLog b/Source/WebKit/efl/ChangeLog index 35da09c..aac8298 100644..100755 --- a/Source/WebKit/efl/ChangeLog +++ b/Source/WebKit/efl/ChangeLog @@ -1,3 +1,132 @@ +2011-04-19 Vsevolod Vlasov <vsevik@chromium.org> + + Reviewed by Pavel Feldman. + + Web Inspector: Rename lengthReceived to encodedDataLength/dataLength + https://bugs.webkit.org/show_bug.cgi?id=58883 + + * WebCoreSupport/FrameLoaderClientEfl.cpp: + (WebCore::FrameLoaderClientEfl::dispatchDidReceiveContentLength): + * WebCoreSupport/FrameLoaderClientEfl.h: + +2011-04-18 Sheriff Bot <webkit.review.bot@gmail.com> + + Unreviewed, rolling out r84155. + http://trac.webkit.org/changeset/84155 + https://bugs.webkit.org/show_bug.cgi?id=58802 + + "paintEntireContents flag is used for painting outside of the + screen. It's not the right way to fix EFL tiled backing + store." (Requested by demarchi on #webkit). + + * ewk/ewk_view_tiled.c: + (_ewk_view_tiled_smart_add): + +2011-04-18 Eunsol Park <eunsol47.park@samsung.com> + + Reviewed by Eric Seidel. + + [EFL] Scroll doesn't work on tiled backing store + https://bugs.webkit.org/show_bug.cgi?id=55021 + + Scroll doesn't work on tiled backing store, but it works on single. + If ewk_frame_paint_full_set() set True, view size return content size and scroll can't be made. + so, ewk_frame_paint_full_set() is removed from ewk_tiled_smart_add(). + + * ewk/ewk_view_tiled.c: + (_ewk_view_tiled_smart_add): + +2011-04-14 Grzegorz Czajkowski <g.czajkowski@samsung.com> + + Reviewed by Antonio Gomes. + + Memory cache API + https://bugs.webkit.org/show_bug.cgi?id=58016 + + * ewk/ewk_settings.cpp: + (ewk_settings_cache_enable_get): + (ewk_settings_cache_enable_set): + (ewk_settings_cache_capacity_set): + * ewk/ewk_settings.h: + +2011-04-13 Grzegorz Czajkowski <g.czajkowski@samsung.com> + + Reviewed by Kent Tamura. + + [EFL] Doxygen documentation for ewk_main, ewk_history and tools + https://bugs.webkit.org/show_bug.cgi?id=58428 + + * ewk/EWebKit.h: + * ewk/ewk_eapi.h: + * ewk/ewk_history.h: + * ewk/ewk_logging.h: + * ewk/ewk_main.cpp: + * ewk/ewk_main.h: + * ewk/ewk_private.h: + * ewk/ewk_util.cpp: + * ewk/ewk_util.h: + +2011-04-11 Gyuyoung Kim <gyuyoung.kim@samsung.com> + + Reviewed by Kenneth Rohde Christiansen. + + [EFL] Adjust dpi value to viewport computation. + https://bugs.webkit.org/show_bug.cgi?id=58130 + + In viewport computation, EFL port have used 160 value for DPI since now. + But, we have to use device's dpi value for viewport meta tag computation. + + * ewk/ewk_view.cpp: + (_ewk_view_viewport_attributes_compute): + +2011-04-10 Gyuyoung Kim <gyuyoung.kim@samsung.com> + + Reviewed by Eric Carlson. + + [EFL] Add seek forward / backward buttons to MediaControl UI. + https://bugs.webkit.org/show_bug.cgi?id=56810 + + Add seek forward / backward buttons to media control. + + * DefaultTheme/default.edc: + * DefaultTheme/widget/mediacontrol/seekbackwardbutton/seekbackward_button.edc: Added. + * DefaultTheme/widget/mediacontrol/seekbackwardbutton/seekbackwardbutton.png: Added. + * DefaultTheme/widget/mediacontrol/seekforwardbutton/seekforward_button.edc: Added. + * DefaultTheme/widget/mediacontrol/seekforwardbutton/seekforwardbutton.png: Added. + +2011-04-04 MORITA Hajime <morrita@google.com> + + Reviewed by Ryosuke Niwa. + + [Refactoring] SpellCheckingResult should be replaced with TextCheckingResult + https://bugs.webkit.org/show_bug.cgi?id=56085 + + * WebCoreSupport/EditorClientEfl.h: + (WebCore::EditorClientEfl::requestCheckingOfString): + +2011-04-01 Grzegorz Czajkowski <g.czajkowski@samsung.com> + + Reviewed by Kenneth Rohde Christiansen. + + [EFL] Synchronization between WebCore's ContextMenuItem.h and ewk_contextmenu.h + https://bugs.webkit.org/show_bug.cgi?id=57000 + + * ewk/ewk_contextmenu.h: + +2011-03-31 Evan Martin <evan@chromium.org> + + Reviewed by Eric Seidel. + + <title> should support dir attribute + https://bugs.webkit.org/show_bug.cgi?id=50961 + + Update to new FrameLoaderClient interface. + + * WebCoreSupport/FrameLoaderClientEfl.cpp: + (WebCore::FrameLoaderClientEfl::dispatchDidReceiveTitle): + (WebCore::FrameLoaderClientEfl::setTitle): + * WebCoreSupport/FrameLoaderClientEfl.h: + 2011-03-29 Gyuyoung Kim <gyuyoung.kim@samsung.com> Reviewed by Antonio Gomes. diff --git a/Source/WebKit/efl/DefaultTheme/default.edc b/Source/WebKit/efl/DefaultTheme/default.edc index f77bd86..e6fbde5 100644 --- a/Source/WebKit/efl/DefaultTheme/default.edc +++ b/Source/WebKit/efl/DefaultTheme/default.edc @@ -78,4 +78,6 @@ collections { #include "widget/slider/slider.edc" #include "widget/mediacontrol/playpausebutton/playpause_button.edc" #include "widget/mediacontrol/mutebutton/mute_button.edc" +#include "widget/mediacontrol/seekforwardbutton/seekforward_button.edc" +#include "widget/mediacontrol/seekbackwardbutton/seekbackward_button.edc" } diff --git a/Source/WebKit/efl/DefaultTheme/widget/mediacontrol/seekbackwardbutton/seekbackward_button.edc b/Source/WebKit/efl/DefaultTheme/widget/mediacontrol/seekbackwardbutton/seekbackward_button.edc new file mode 100644 index 0000000..1bb253c --- /dev/null +++ b/Source/WebKit/efl/DefaultTheme/widget/mediacontrol/seekbackwardbutton/seekbackward_button.edc @@ -0,0 +1,50 @@ +/* + Copyright (C) 2008,2009 INdT - Instituto Nokia de Tecnologia + Copyright (C) 2009,2010 ProFUSION embedded systems + Copyright (C) 2011 Samsung Electronics + + This file is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + + group { + name: "webkit/widget/mediacontrol/seekbackward_button"; + + images { + image: "widget/mediacontrol/seekbackwardbutton/seekbackwardbutton.png" COMP; + } + + parts { + part { + name: "seekbackward_button"; + type: IMAGE; + description { state: "default" 0.0; + min: 25 25; + } + description { state: "seekbackward" 0.0; + inherit: "default" 0.0; + image.normal: "widget/mediacontrol/seekbackwardbutton/seekbackwardbutton.png"; + } + } + } + + programs { + program { + signal: "seekbackward"; + action: STATE_SET "seekbackward" 0.0; + target: "seekbackward_button"; + } + } + } diff --git a/Source/WebKit/efl/DefaultTheme/widget/mediacontrol/seekbackwardbutton/seekbackwardbutton.png b/Source/WebKit/efl/DefaultTheme/widget/mediacontrol/seekbackwardbutton/seekbackwardbutton.png Binary files differnew file mode 100755 index 0000000..f3467cd --- /dev/null +++ b/Source/WebKit/efl/DefaultTheme/widget/mediacontrol/seekbackwardbutton/seekbackwardbutton.png diff --git a/Source/WebKit/efl/DefaultTheme/widget/mediacontrol/seekforwardbutton/seekforward_button.edc b/Source/WebKit/efl/DefaultTheme/widget/mediacontrol/seekforwardbutton/seekforward_button.edc new file mode 100644 index 0000000..e34e7f7 --- /dev/null +++ b/Source/WebKit/efl/DefaultTheme/widget/mediacontrol/seekforwardbutton/seekforward_button.edc @@ -0,0 +1,50 @@ +/* + Copyright (C) 2008,2009 INdT - Instituto Nokia de Tecnologia + Copyright (C) 2009,2010 ProFUSION embedded systems + Copyright (C) 2011 Samsung Electronics + + This file is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + + group { + name: "webkit/widget/mediacontrol/seekforward_button"; + + images { + image: "widget/mediacontrol/seekforwardbutton/seekforwardbutton.png" COMP; + } + + parts { + part { + name: "seekforward_button"; + type: IMAGE; + description { state: "default" 0.0; + min: 25 25; + } + description { state: "seekforward" 0.0; + inherit: "default" 0.0; + image.normal: "widget/mediacontrol/seekforwardbutton/seekforwardbutton.png"; + } + } + } + + programs { + program { + signal: "seekforward"; + action: STATE_SET "seekforward" 0.0; + target: "seekforward_button"; + } + } + } diff --git a/Source/WebKit/efl/DefaultTheme/widget/mediacontrol/seekforwardbutton/seekforwardbutton.png b/Source/WebKit/efl/DefaultTheme/widget/mediacontrol/seekforwardbutton/seekforwardbutton.png Binary files differnew file mode 100755 index 0000000..c2fe828 --- /dev/null +++ b/Source/WebKit/efl/DefaultTheme/widget/mediacontrol/seekforwardbutton/seekforwardbutton.png diff --git a/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.h b/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.h index 575a50d..56b3300 100644 --- a/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.h +++ b/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.h @@ -114,7 +114,7 @@ public: virtual void getGuessesForWord(const String& word, const String& context, WTF::Vector<String>& guesses); virtual void willSetInputMethodState(); virtual void setInputMethodState(bool enabled); - virtual void requestCheckingOfString(WebCore::SpellChecker*, int, const WTF::String&) {} + virtual void requestCheckingOfString(WebCore::SpellChecker*, int, WebCore::TextCheckingTypeMask, const WTF::String&) {} virtual TextCheckerClient* textChecker() { return this; } private: diff --git a/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp b/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp index fa34ac9..9a409f2 100644 --- a/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp +++ b/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp @@ -576,9 +576,10 @@ void FrameLoaderClientEfl::dispatchDidStartProvisionalLoad() ewk_view_load_provisional(m_view); } -void FrameLoaderClientEfl::dispatchDidReceiveTitle(const String& title) +void FrameLoaderClientEfl::dispatchDidReceiveTitle(const StringWithDirection& title) { - CString cs = title.utf8(); + // FIXME: use direction of title. + CString cs = title.string().utf8(); ewk_frame_title_set(m_frame, cs.data()); if (ewk_view_frame_main_get(m_view) != m_frame) @@ -709,12 +710,12 @@ void FrameLoaderClientEfl::prepareForDataSourceReplacement() notImplemented(); } -void FrameLoaderClientEfl::setTitle(const String& title, const KURL& url) +void FrameLoaderClientEfl::setTitle(const StringWithDirection& title, const KURL& url) { // no need for, dispatchDidReceiveTitle is the right callback } -void FrameLoaderClientEfl::dispatchDidReceiveContentLength(DocumentLoader*, unsigned long identifier, int lengthReceived) +void FrameLoaderClientEfl::dispatchDidReceiveContentLength(DocumentLoader*, unsigned long identifier, int dataLength) { notImplemented(); } diff --git a/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h b/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h index 5ea4e8c..3efa2f5 100644 --- a/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h +++ b/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h @@ -88,7 +88,7 @@ class FrameLoaderClientEfl : public FrameLoaderClient { virtual void dispatchDidCancelAuthenticationChallenge(DocumentLoader*, unsigned long identifier, const AuthenticationChallenge&); virtual void dispatchDidReceiveResponse(DocumentLoader*, unsigned long identifier, const ResourceResponse&); - virtual void dispatchDidReceiveContentLength(DocumentLoader*, unsigned long identifier, int lengthReceived); + virtual void dispatchDidReceiveContentLength(DocumentLoader*, unsigned long identifier, int dataLength); virtual void dispatchDidFinishLoading(DocumentLoader*, unsigned long identifier); virtual void dispatchDidFailLoading(DocumentLoader*, unsigned long identifier, const ResourceError&); virtual bool dispatchDidLoadResourceFromMemoryCache(DocumentLoader*, const ResourceRequest&, const ResourceResponse&, int length); @@ -102,7 +102,7 @@ class FrameLoaderClientEfl : public FrameLoaderClient { virtual void dispatchWillClose(); virtual void dispatchDidReceiveIcon(); virtual void dispatchDidStartProvisionalLoad(); - virtual void dispatchDidReceiveTitle(const String&); + virtual void dispatchDidReceiveTitle(const StringWithDirection&); virtual void dispatchDidChangeIcons(); virtual void dispatchDidCommitLoad(); virtual void dispatchDidFailProvisionalLoad(const ResourceError&); @@ -193,7 +193,7 @@ class FrameLoaderClientEfl : public FrameLoaderClient { virtual void prepareForDataSourceReplacement(); virtual WTF::PassRefPtr<DocumentLoader> createDocumentLoader(const ResourceRequest&, const SubstituteData&); - virtual void setTitle(const String& title, const KURL&); + virtual void setTitle(const StringWithDirection& title, const KURL&); virtual String userAgent(const KURL&); diff --git a/Source/WebKit/efl/ewk/EWebKit.h b/Source/WebKit/efl/ewk/EWebKit.h index 183e9dc..6d741e9 100644 --- a/Source/WebKit/efl/ewk/EWebKit.h +++ b/Source/WebKit/efl/ewk/EWebKit.h @@ -19,6 +19,13 @@ Boston, MA 02110-1301, USA. */ +/** + * @file EWebKit.h + * @brief Contains the header files that are required by WebKit-EFL. + * + * It includes the all header files that are exported to public API and Evas header. + */ + #ifndef EWebKit_h #define EWebKit_h diff --git a/Source/WebKit/efl/ewk/ewk_contextmenu.h b/Source/WebKit/efl/ewk/ewk_contextmenu.h index 7b60410..d9e3e83 100644 --- a/Source/WebKit/efl/ewk/ewk_contextmenu.h +++ b/Source/WebKit/efl/ewk/ewk_contextmenu.h @@ -98,11 +98,21 @@ enum _Ewk_Context_Menu_Action { EWK_CONTEXT_MENU_ITEM_TAG_RIGHT_TO_LEFT, EWK_CONTEXT_MENU_ITEM_TAG_PDFSINGLE_PAGE_SCROLLING, EWK_CONTEXT_MENU_ITEM_TAG_PDFFACING_PAGES_SCROLLING, + // EWK_CONTEXT_MENU_ITEM_TAG_INSPECT_ELEMENT, /**< This feature is disabled in WebKit-EFL - it is a subject to INSPECTOR build variable */ EWK_CONTEXT_MENU_ITEM_TAG_TEXT_DIRECTION_MENU, /**< text direction sub-menu */ EWK_CONTEXT_MENU_ITEM_TAG_TEXT_DIRECTION_DEFAULT, EWK_CONTEXT_MENU_ITEM_TAG_TEXT_DIRECTION_LEFT_TO_RIGHT, EWK_CONTEXT_MENU_ITEM_TAG_TEXT_DIRECTION_RIGHT_TO_LEFT, + EWK_CONTEXT_MENU_ITEM_OPEN_MEDIA_IN_NEW_WINDOW, + EWK_CONTEXT_MENU_ITEM_TAG_COPY_MEDIA_LINK_TO_CLIPBOARD, + EWK_CONTEXT_MENU_ITEM_TAG_TOGGLE_MEDIA_CONTROLS, + EWK_CONTEXT_MENU_ITEM_TAG_TOGGLE_MEDIA_LOOP, + EWK_CONTEXT_MENU_ITEM_TAG_ENTER_VIDEO_FULLSCREEN, + EWK_CONTEXT_MENU_ITEM_TAG_MEDIA_PLAY_PAUSE, + EWK_CONTEXT_MENU_ITEM_TAG_MEDIA_MUTE, EWK_CONTEXT_MENU_ITEM_BASE_CUSTOM_TAG = 5000, + EWK_CONTEXT_MENU_ITEM_CUSTOM_TAG_NO_ACTION = 5998, + EWK_CONTEXT_MENU_ITEM_LAST_CUSTOM_TAG = 5999, EWK_CONTEXT_MENU_ITEM_BASE_APPLICATION_TAG = 10000 }; /** Creates a type name for _Ewk_Context_Menu_Action */ diff --git a/Source/WebKit/efl/ewk/ewk_eapi.h b/Source/WebKit/efl/ewk/ewk_eapi.h index adb8d7b..11f4371 100644 --- a/Source/WebKit/efl/ewk/ewk_eapi.h +++ b/Source/WebKit/efl/ewk/ewk_eapi.h @@ -18,6 +18,15 @@ Boston, MA 02110-1301, USA. */ +/** + * @file ewk_eapi.h + * @brief Defines EAPI macro. + * + * The macro must be used in declaration of public functions. + * Functions without EAPI macro have hidden most of symbols and + * they are not visible for target applications. + */ + #ifndef ewk_eapi_h #define ewk_eapi_h diff --git a/Source/WebKit/efl/ewk/ewk_history.h b/Source/WebKit/efl/ewk/ewk_history.h index 3943d7e..3cae74e 100644 --- a/Source/WebKit/efl/ewk/ewk_history.h +++ b/Source/WebKit/efl/ewk/ewk_history.h @@ -32,7 +32,8 @@ extern "C" { #endif /** - * The history (back-forward list) associated with a given ewk_view. + * @file ewk_history.h + * @brief The history (back-forward list) associated with a given ewk_view. * * Changing the history affects immediately the view, changing the * current uri, for example. diff --git a/Source/WebKit/efl/ewk/ewk_logging.h b/Source/WebKit/efl/ewk/ewk_logging.h index 045bd9c..f8a7f41 100644 --- a/Source/WebKit/efl/ewk/ewk_logging.h +++ b/Source/WebKit/efl/ewk/ewk_logging.h @@ -18,6 +18,11 @@ Boston, MA 02110-1301, USA. */ +/** + * @file ewk_logging.h + * @brief Provides macros for logging. + */ + #ifndef ewk_logging_h #define ewk_logging_h diff --git a/Source/WebKit/efl/ewk/ewk_main.cpp b/Source/WebKit/efl/ewk/ewk_main.cpp index 0c7cc70..9687f10 100644 --- a/Source/WebKit/efl/ewk/ewk_main.cpp +++ b/Source/WebKit/efl/ewk/ewk_main.cpp @@ -56,10 +56,25 @@ #endif static int _ewk_init_count = 0; + +/** + * \var _ewk_log_dom + * @brief the log domain identifier that is used with EINA's macros + */ int _ewk_log_dom = -1; static Eina_Bool _ewk_init_body(void); +/** + * Initializes webkit's instance. + * + * - initializes components needed by Efl, + * - sets web database location, + * - sets page cache capacity, + * - increases a reference count of webkit's instance. + * + * @return a reference count of webkit's instance on success or 0 on failure + */ int ewk_init(void) { if (_ewk_init_count) @@ -113,6 +128,13 @@ error_eina: return 0; } +/** + * Decreases a reference count of webkit's instance, possibly destroying it. + * + * If the reference count reaches 0 webkit's instance is destroyed. + * + * @return a reference count of webkit's instance + */ int ewk_shutdown(void) { _ewk_init_count--; diff --git a/Source/WebKit/efl/ewk/ewk_main.h b/Source/WebKit/efl/ewk/ewk_main.h index 3730e88..257babc 100644 --- a/Source/WebKit/efl/ewk/ewk_main.h +++ b/Source/WebKit/efl/ewk/ewk_main.h @@ -18,6 +18,11 @@ Boston, MA 02110-1301, USA. */ +/** + * @file ewk_main.h + * @brief The main file of WebKit-EFL, not tied to any view object. + */ + #ifndef ewk_main_h #define ewk_main_h diff --git a/Source/WebKit/efl/ewk/ewk_private.h b/Source/WebKit/efl/ewk/ewk_private.h index 114c39e..c3de98a 100644 --- a/Source/WebKit/efl/ewk/ewk_private.h +++ b/Source/WebKit/efl/ewk/ewk_private.h @@ -18,6 +18,11 @@ Boston, MA 02110-1301, USA. */ +/** + * @file ewk_private.h + * @brief Private methods of WebKit-EFL. + */ + #ifndef ewk_private_h #define ewk_private_h diff --git a/Source/WebKit/efl/ewk/ewk_settings.cpp b/Source/WebKit/efl/ewk/ewk_settings.cpp index 3a185d9..16abdc7 100644 --- a/Source/WebKit/efl/ewk/ewk_settings.cpp +++ b/Source/WebKit/efl/ewk/ewk_settings.cpp @@ -29,6 +29,7 @@ #include "Image.h" #include "IntSize.h" #include "KURL.h" +#include "MemoryCache.h" #include "ewk_private.h" #include <Eina.h> @@ -326,6 +327,46 @@ const char* ewk_settings_proxy_uri_get(void) } /** + * Gets status of the memory cache of WebCore. + * + * @return @c EINA_TRUE if the cache is enabled or @c EINA_FALSE if not + */ +Eina_Bool ewk_settings_cache_enable_get(void) +{ + WebCore::MemoryCache* cache = WebCore::memoryCache(); + return !cache->disabled(); +} + +/** + * Enables/disables the memory cache of WebCore, possibly clearing it. + * + * Disabling the cache will remove all resources from the cache. + * They may still live on if they are referenced by some Web page though. + * + * @param set @c EINA_TRUE to enable memory cache, @c EINA_FALSE to disable + */ +void ewk_settings_cache_enable_set(Eina_Bool set) +{ + WebCore::MemoryCache* cache = WebCore::memoryCache(); + set = !set; + if (cache->disabled() != set) + cache->setDisabled(set); +} + +/** + * Sets capacity of memory cache of WebCore. + * + * WebCore sets default value of memory cache on 8192 * 1024 bytes. + * + * @param capacity the maximum number of bytes that the cache should consume overall + */ +void ewk_settings_cache_capacity_set(unsigned capacity) +{ + WebCore::MemoryCache* cache = WebCore::memoryCache(); + cache->setCapacities(0, capacity, capacity); +} + +/** * @internal * * Gets the default user agent string. diff --git a/Source/WebKit/efl/ewk/ewk_settings.h b/Source/WebKit/efl/ewk/ewk_settings.h index 3e5ca47..0bbdb48 100644 --- a/Source/WebKit/efl/ewk/ewk_settings.h +++ b/Source/WebKit/efl/ewk/ewk_settings.h @@ -54,6 +54,10 @@ EAPI const char *ewk_settings_cache_directory_path_get(void); EAPI void ewk_settings_proxy_uri_set(const char* proxy); EAPI const char* ewk_settings_proxy_uri_get(void); +EAPI Eina_Bool ewk_settings_cache_enable_get(void); +EAPI void ewk_settings_cache_enable_set(Eina_Bool set); +EAPI void ewk_settings_cache_capacity_set(unsigned capacity); + #ifdef __cplusplus } #endif diff --git a/Source/WebKit/efl/ewk/ewk_util.cpp b/Source/WebKit/efl/ewk/ewk_util.cpp index 6830f76..b01be72 100644 --- a/Source/WebKit/efl/ewk/ewk_util.cpp +++ b/Source/WebKit/efl/ewk/ewk_util.cpp @@ -24,6 +24,13 @@ #include "ewk_private.h" #include <eina_safety_checks.h> +/** + * Converts an image from cairo_surface to the Evas_Object. + * + * @param canvas display canvas + * @param surface cairo representation of an image + * @return converted cairo_surface object to the Evas_Object + */ Evas_Object* ewk_util_image_from_cairo_surface_add(Evas* canvas, cairo_surface_t* surface) { cairo_status_t status; diff --git a/Source/WebKit/efl/ewk/ewk_util.h b/Source/WebKit/efl/ewk/ewk_util.h index d9c8f9c..2371888 100644 --- a/Source/WebKit/efl/ewk/ewk_util.h +++ b/Source/WebKit/efl/ewk/ewk_util.h @@ -18,6 +18,11 @@ Boston, MA 02110-1301, USA. */ +/** + * @file ewk_util.h + * @brief Helpfull methods for WebKit-EFL. + */ + #ifndef ewk_util_h #define ewk_util_h diff --git a/Source/WebKit/efl/ewk/ewk_view.cpp b/Source/WebKit/efl/ewk/ewk_view.cpp index 8a3b04d..a6749de 100644 --- a/Source/WebKit/efl/ewk/ewk_view.cpp +++ b/Source/WebKit/efl/ewk/ewk_view.cpp @@ -1010,7 +1010,7 @@ static WebCore::ViewportAttributes _ewk_view_viewport_attributes_compute(Evas_Ob EWK_VIEW_PRIV_GET(sd, priv); int desktop_width = 980; - int device_dpi = 160; + int device_dpi = ewk_view_dpi_get(); int available_width = (int) priv->page->chrome()->client()->pageRect().width(); int available_height = (int) priv->page->chrome()->client()->pageRect().height(); |
