summaryrefslogtreecommitdiffstats
path: root/WebKit/efl
diff options
context:
space:
mode:
Diffstat (limited to 'WebKit/efl')
-rw-r--r--WebKit/efl/CMakeListsEfl.txt6
-rw-r--r--WebKit/efl/ChangeLog80
-rw-r--r--WebKit/efl/DefaultTheme/default.edc1
-rw-r--r--WebKit/efl/ewk/ewk_frame.cpp2
-rw-r--r--WebKit/efl/ewk/ewk_main.cpp1
-rw-r--r--WebKit/efl/ewk/ewk_view.cpp37
-rw-r--r--WebKit/efl/ewk/ewk_view.h3
7 files changed, 127 insertions, 3 deletions
diff --git a/WebKit/efl/CMakeListsEfl.txt b/WebKit/efl/CMakeListsEfl.txt
index e5fb9ef..cdb24ff 100644
--- a/WebKit/efl/CMakeListsEfl.txt
+++ b/WebKit/efl/CMakeListsEfl.txt
@@ -49,6 +49,10 @@ LIST(APPEND WebKit_LIBRARIES
${LIBXML2_LIBRARIES}
${Pango_LIBRARIES}
${SQLITE_LIBRARIES}
+ ${FONTCONFIG_LIBRARIES}
+ ${PNG_LIBRARY}
+ ${JPEG_LIBRARY}
+ ${CMAKE_DL_LIBS}
)
IF (ENABLE_GLIB_SUPPORT)
@@ -173,7 +177,7 @@ IF (ENABLE_GLIB_SUPPORT)
LIST(APPEND EWebLauncher_LIBRARIES
${Gdk_LIBRARIES}
${Glib_LIBRARIES}
- ${GTHREAD_LIBRARIES}
+ ${Gthread_LIBRARIES}
)
ENDIF ()
diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
index de65885..e1ce89a 100644
--- a/WebKit/efl/ChangeLog
+++ b/WebKit/efl/ChangeLog
@@ -1,3 +1,83 @@
+2010-08-25 Jaehun Lim <ljaehun.lim@samsung.com>
+
+ Reviewed by Antonio Gomes.
+
+ [EFL] enable libsoup's content decode feature
+ https://bugs.webkit.org/show_bug.cgi?id=44147
+
+ libsoup's content decode feature is enabled during initializaton.
+
+ * ewk/ewk_main.cpp:
+ (ewk_init):
+
+2010-08-25 Rafael Antognolli <antognolli@profusion.mobi>
+
+ Unreviewed build fix.
+
+ [EFL] Build fix for revision 65332
+ https://bugs.webkit.org/show_bug.cgi?id=44543
+
+ Use Gthread_LIBRARIES instead of GTHREAD_LIBRARIES. This fix
+ the build when using ENABLE_GLIB_SUPPORT=ON and NETWORK_BACKEND=curl.
+
+ * CMakeListsEfl.txt:
+
+2010-08-24 Lukasz Slachciak <l.slachciak@samsung.com>
+
+ Reviewed by Antonio Gomes.
+
+ [EFL] Extended EFL WebView API to allow enable/disable Frame Flattening
+ https://bugs.webkit.org/show_bug.cgi?id=44253
+
+ * ewk/ewk_view.cpp:
+ (ewk_view_setting_enable_frame_flattening_get):
+ (ewk_view_setting_enable_frame_flattening_set):
+ * ewk/ewk_view.h:
+
+2010-08-23 Leandro Pereira <leandro@profusion.mobi>
+
+ [EFL] Build fix for platforms that do not require linking with "dl".
+ CMake includes the variable CMAKE_DL_LIBS that evaluates to the
+ platform-specific libraries.
+
+ * CMakeListsEfl.txt: Use ${CMAKE_DL_LIBS} instead of dl.
+
+2010-08-22 Rafael Antognolli <antognolli@profusion.mobi>
+
+ Reviewed by Antonio Gomes.
+
+ [EFL] Remove duplicated include entry from default theme.
+ https://bugs.webkit.org/show_bug.cgi?id=44345
+
+ This used to create the group webkit/widget/entry twice in
+ the theme. It's leading to a bug with the newer versions of
+ EFL.
+
+ * DefaultTheme/default.edc:
+
+2010-08-22 Daniel Bates <dbates@rim.com>
+
+ Reviewed by Eric Seidel.
+
+ Encapsulate document marker management into DocumentMarkerController
+ https://bugs.webkit.org/show_bug.cgi?id=44383
+
+ Modify call sites in the EFL port to use DocumentMarkerController.
+
+ No functionality was changed, so no new tests.
+
+ * ewk/ewk_frame.cpp:
+ (ewk_frame_text_matches_unmark_all):
+
+2010-08-20 Leandro Pereira <leandro@profusion.mobi>
+
+ [EFL] Unreviewed. Fix build when using GNU gold.
+ When linking with GNU gold, some symbols are not found: explicitly
+ link with the required libraries.
+
+ * CMakeListsEfl.txt: Depend on Fontconfig, PNG, JPEG and dl
+ libraries.
+
2010-08-15 Gyuyoung Kim <gyuyoung.kim@samsung.com>
Reviewed by Antonio Gomes.
diff --git a/WebKit/efl/DefaultTheme/default.edc b/WebKit/efl/DefaultTheme/default.edc
index e9f55f0..0496a24 100644
--- a/WebKit/efl/DefaultTheme/default.edc
+++ b/WebKit/efl/DefaultTheme/default.edc
@@ -63,7 +63,6 @@ collections {
}
#include "widget/button/button.edc"
-#include "widget/entry/entry.edc"
#include "widget/scrollbar/scrollbar.edc"
#include "widget/radio/radio.edc"
#include "widget/check/check.edc"
diff --git a/WebKit/efl/ewk/ewk_frame.cpp b/WebKit/efl/ewk/ewk_frame.cpp
index 296c261..7a2af5a 100644
--- a/WebKit/efl/ewk/ewk_frame.cpp
+++ b/WebKit/efl/ewk/ewk_frame.cpp
@@ -786,7 +786,7 @@ Eina_Bool ewk_frame_text_matches_unmark_all(Evas_Object* o)
EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
- sd->frame->document()->removeMarkers(WebCore::DocumentMarker::TextMatch);
+ sd->frame->document()->markers()->removeMarkers(WebCore::DocumentMarker::TextMatch);
return EINA_TRUE;
}
diff --git a/WebKit/efl/ewk/ewk_main.cpp b/WebKit/efl/ewk/ewk_main.cpp
index 5742766..1cd5e42 100644
--- a/WebKit/efl/ewk/ewk_main.cpp
+++ b/WebKit/efl/ewk/ewk_main.cpp
@@ -125,6 +125,7 @@ int ewk_init(void)
if (1) {
SoupSession* session = WebCore::ResourceHandle::defaultSession();
soup_session_add_feature_by_type(session, SOUP_TYPE_CONTENT_SNIFFER);
+ soup_session_add_feature_by_type(session, SOUP_TYPE_CONTENT_DECODER);
}
#endif
diff --git a/WebKit/efl/ewk/ewk_view.cpp b/WebKit/efl/ewk/ewk_view.cpp
index 7a98bac..4a100d7 100644
--- a/WebKit/efl/ewk/ewk_view.cpp
+++ b/WebKit/efl/ewk/ewk_view.cpp
@@ -102,6 +102,7 @@ struct _Ewk_View_Private_Data {
Eina_Bool auto_shrink_images:1;
Eina_Bool enable_scripts:1;
Eina_Bool enable_plugins:1;
+ Eina_Bool enable_frame_flattening:1;
Eina_Bool scripts_window_open:1;
Eina_Bool resizable_textareas:1;
Eina_Bool private_browsing:1;
@@ -589,6 +590,7 @@ static Ewk_View_Private_Data* _ewk_view_priv_new(Ewk_View_Smart_Data* sd)
priv->settings.auto_shrink_images = priv->page_settings->shrinksStandaloneImagesToFit();
priv->settings.enable_scripts = priv->page_settings->isJavaScriptEnabled();
priv->settings.enable_plugins = priv->page_settings->arePluginsEnabled();
+ priv->settings.enable_frame_flattening = priv->page_settings->frameFlatteningEnabled();
priv->settings.scripts_window_open = priv->page_settings->allowScriptsToCloseWindows();
priv->settings.resizable_textareas = priv->page_settings->textAreasAreResizable();
priv->settings.private_browsing = priv->page_settings->privateBrowsingEnabled();
@@ -2291,6 +2293,41 @@ Eina_Bool ewk_view_setting_enable_plugins_set(Evas_Object* o, Eina_Bool enable)
return EINA_TRUE;
}
+/**
+ * Get status of frame flattening.
+ *
+ * @param o view to check status
+ *
+ * @return EINA_TRUE if flattening is enabled, EINA_FALSE
+ * otherwise (errors, flattening disabled).
+ */
+Eina_Bool ewk_view_setting_enable_frame_flattening_get(const Evas_Object* o)
+{
+ EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+ EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
+ return priv->settings.enable_frame_flattening;
+}
+
+/**
+ * Set frame flattening.
+ *
+ * @param o view to set flattening
+ *
+ * @return EINA_TRUE if flattening status set, EINA_FALSE
+ * otherwise (errors).
+ */
+Eina_Bool ewk_view_setting_enable_frame_flattening_set(Evas_Object* o, Eina_Bool enable)
+{
+ EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+ EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
+ enable = !!enable;
+ if (priv->settings.enable_frame_flattening != enable) {
+ priv->page_settings->setFrameFlatteningEnabled(enable);
+ priv->settings.enable_frame_flattening = enable;
+ }
+ return EINA_TRUE;
+}
+
Eina_Bool ewk_view_setting_scripts_window_open_get(const Evas_Object* o)
{
EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
diff --git a/WebKit/efl/ewk/ewk_view.h b/WebKit/efl/ewk/ewk_view.h
index 8dd6178..9d5997c 100644
--- a/WebKit/efl/ewk/ewk_view.h
+++ b/WebKit/efl/ewk/ewk_view.h
@@ -389,6 +389,9 @@ EAPI Eina_Bool ewk_view_setting_enable_scripts_set(Evas_Object *o, Eina_Bool
EAPI Eina_Bool ewk_view_setting_enable_plugins_get(const Evas_Object *o);
EAPI Eina_Bool ewk_view_setting_enable_plugins_set(Evas_Object *o, Eina_Bool enable);
+EAPI Eina_Bool ewk_view_setting_enable_frame_flattening_get(const Evas_Object* o);
+EAPI Eina_Bool ewk_view_setting_enable_frame_flattening_set(Evas_Object* o, Eina_Bool enable);
+
EAPI Eina_Bool ewk_view_setting_scripts_window_open_get(const Evas_Object *o);
EAPI Eina_Bool ewk_view_setting_scripts_window_open_set(Evas_Object *o, Eina_Bool allow);