summaryrefslogtreecommitdiff
path: root/Source/WebKit/efl
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebKit/efl')
-rw-r--r--Source/WebKit/efl/ChangeLog74
-rw-r--r--Source/WebKit/efl/DefaultTheme/CMakeLists.txt212
-rw-r--r--Source/WebKit/efl/DefaultTheme/default.edc12
-rw-r--r--Source/WebKit/efl/DefaultTheme/widget/button/button.edc4
-rw-r--r--Source/WebKit/efl/ewk/ewk_frame.cpp5
-rw-r--r--Source/WebKit/efl/ewk/ewk_view_single.cpp16
6 files changed, 204 insertions, 119 deletions
diff --git a/Source/WebKit/efl/ChangeLog b/Source/WebKit/efl/ChangeLog
index 2007c5354..0310650bd 100644
--- a/Source/WebKit/efl/ChangeLog
+++ b/Source/WebKit/efl/ChangeLog
@@ -1,3 +1,77 @@
+2012-11-29 Ryuan Choi <ryuan.choi@samsung.com>
+
+ [EFL] Broken rendering occurs when scrolling in ewk_view_single.
+ https://bugs.webkit.org/show_bug.cgi?id=77325
+
+ Reviewed by Gyuyoung Kim.
+
+ After r104687, broken rendering occurs when scrolling contents.
+ It's because scrollWidth can be smaller than width of image buffer.
+
+ This patch fixes it and renames parameter to avoid confusion.
+
+ * ewk/ewk_view_single.cpp:
+ (_ewk_view_screen_move):
+ (_ewk_view_single_scroll_process_single):
+
+2012-11-28 Ryuan Choi <ryuan.choi@gmail.com>
+
+ [EFL] Generate big_button_theme.edj
+ https://bugs.webkit.org/show_bug.cgi?id=103511
+
+ Reviewed by Gyuyoung Kim.
+
+ big_button_theme.edj, binary file which is used for test, should be generated.
+
+ * DefaultTheme/CMakeLists.txt:
+ Introduced macro and new target to share files of default theme instead
+ of adding many files for big_button_theme.
+ * DefaultTheme/widget/button/button.edc:
+ Implemented for big_button_theme.
+
+2012-11-28 Ryuan Choi <ryuan.choi@gmail.com>
+
+ [EFL] Refactor theme to choose whether to support foreground color of selection
+ https://bugs.webkit.org/show_bug.cgi?id=102037
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ * DefaultTheme/default.edc:
+ Refactored color classes from active/inactive to foreground/background.
+
+2012-11-27 James Simonsen <simonjam@chromium.org>
+
+ Consolidate FrameLoader::load() into one function taking a FrameLoadRequest
+ https://bugs.webkit.org/show_bug.cgi?id=102151
+
+ Reviewed by Adam Barth.
+
+ * ewk/ewk_frame.cpp:
+ (_ewk_frame_contents_set_internal):
+
+2012-11-27 Sheriff Bot <webkit.review.bot@gmail.com>
+
+ Unreviewed, rolling out r135786.
+ http://trac.webkit.org/changeset/135786
+ https://bugs.webkit.org/show_bug.cgi?id=103379
+
+ It made 3 plugin tests timeout on several platforms (Requested
+ by Ossy on #webkit).
+
+ * ewk/ewk_frame.cpp:
+ (ewk_frame_uri_set):
+ (_ewk_frame_contents_set_internal):
+
+2012-11-26 James Simonsen <simonjam@chromium.org>
+
+ Consolidate FrameLoader::load() into one function taking a FrameLoadRequest
+ https://bugs.webkit.org/show_bug.cgi?id=102151
+
+ Reviewed by Adam Barth.
+
+ * ewk/ewk_frame.cpp:
+ (_ewk_frame_contents_set_internal):
+
2012-11-24 Viatcheslav Ostapenko <v.ostapenko@samsung.com>
[EFL] Layout test comes to crash on WK1
diff --git a/Source/WebKit/efl/DefaultTheme/CMakeLists.txt b/Source/WebKit/efl/DefaultTheme/CMakeLists.txt
index 850749e14..ded410845 100644
--- a/Source/WebKit/efl/DefaultTheme/CMakeLists.txt
+++ b/Source/WebKit/efl/DefaultTheme/CMakeLists.txt
@@ -1,110 +1,116 @@
-SET(DefaultTheme_RESOURCE_NAME default.edj)
-SET(DefaultTheme_DIR "${WEBKIT_DIR}/efl/DefaultTheme")
+MACRO (GENERATE_THEME _target_name _name _option)
+ SET(DefaultTheme_DIR "${WEBKIT_DIR}/efl/DefaultTheme")
+
+ ADD_CUSTOM_COMMAND(
+ OUTPUT ${THEME_BINARY_DIR}/${_name}
+ COMMAND ${EDJE_CC_EXECUTABLE} -v ${_option} default.edc ${THEME_BINARY_DIR}/${_name}
+ DEPENDS
+ default.edc
+ widget/button/button.edc
+ widget/button/img_button_focus.png
+ widget/button/img_button_hover.png
+ widget/button/img_button_normal.png
+ widget/button/img_button_press.png
+ widget/check/check.edc
+ widget/check/img_check_off_focus.png
+ widget/check/img_check_off_hover.png
+ widget/check/img_check_off.png
+ widget/check/img_check_on_focus.png
+ widget/check/img_check_on_hover.png
+ widget/check/img_check_on.png
+ widget/combo/combo.edc
+ widget/combo/combo_focus_button.png
+ widget/combo/combo_focus.png
+ widget/combo/combo_hover_button.png
+ widget/combo/combo_hover.png
+ widget/combo/combo_normal_button.png
+ widget/combo/combo_normal.png
+ widget/combo/combo_press_button.png
+ widget/combo/combo_press.png
+ widget/combo/icon.png
+ widget/entry/entry.edc
+ widget/entry/img_focused.png
+ widget/entry/img_hovered.png
+ widget/entry/img_normal.png
+ widget/file/file.edc
+ widget/file/file_focus.png
+ widget/file/file_hover.png
+ widget/file/file_normal.png
+ widget/file/file_press.png
+ widget/mediacontrol/fullscreenbutton/enterfullscreenbutton.png
+ widget/mediacontrol/fullscreenbutton/exitfullscreenbutton.png
+ widget/mediacontrol/fullscreenbutton/fullscreen_button.edc
+ widget/mediacontrol/mutebutton/mute_button.edc
+ widget/mediacontrol/mutebutton/mutebutton.png
+ widget/mediacontrol/mutebutton/unmutebutton.png
+ widget/mediacontrol/playpausebutton/pausebutton.png
+ widget/mediacontrol/playpausebutton/playbutton.png
+ widget/mediacontrol/playpausebutton/playpause_button.edc
+ widget/mediacontrol/seekbackwardbutton/seekbackward_button.edc
+ widget/mediacontrol/seekbackwardbutton/seekbackwardbutton.png
+ widget/mediacontrol/seekforwardbutton/seekforward_button.edc
+ widget/mediacontrol/seekforwardbutton/seekforwardbutton.png
+ widget/mediacontrol/togglecaptionsbutton/closedcaption_disabled.png
+ widget/mediacontrol/togglecaptionsbutton/closedcaption.png
+ widget/mediacontrol/togglecaptionsbutton/toggle_captions_button.edc
+ widget/progressbar/bt_base.png
+ widget/progressbar/progressbar.edc
+ widget/progressbar/shelf_inset.png
+ widget/radio/img_radio_off_focus.png
+ widget/radio/img_radio_off_hover.png
+ widget/radio/img_radio_off.png
+ widget/radio/img_radio_on_focus.png
+ widget/radio/img_radio_on_hover.png
+ widget/radio/img_radio_on.png
+ widget/radio/radio.edc
+ widget/scrollbar/scrollbar.edc
+ widget/scrollbar/scrollbar_h.png
+ widget/scrollbar/scrollbar_knob_h.png
+ widget/scrollbar/scrollbar_knob_v.png
+ widget/scrollbar/scrollbar_v.png
+ widget/search/cancel/cancel_normal_button2.png
+ widget/search/cancel/cancel_normal_button.png
+ widget/search/cancel/search_cancel.edc
+ widget/search/decoration/decoration_normal_button.png
+ widget/search/decoration/search_decoration.edc
+ widget/search/field/field_focused.png
+ widget/search/field/field_hovered.png
+ widget/search/field/field_normal.png
+ widget/search/field/search_field.edc
+ widget/slider/slider.edc
+ widget/slider/slider_fill_h.png
+ widget/slider/slider_fill_v.png
+ widget/slider/slider_h.png
+ widget/slider/slider_thumb_h.png
+ widget/slider/slider_thumb_press_h.png
+ widget/slider/slider_thumb_press_v.png
+ widget/slider/slider_thumb_v.png
+ widget/slider/slider_v.png
+ widget/spinner/sp_bg.png
+ widget/spinner/sp_down_default.png
+ widget/spinner/sp_down_hover.png
+ widget/spinner/sp_down_pressed.png
+ widget/spinner/spinner.edc
+ widget/spinner/sp_up_default.png
+ widget/spinner/sp_up_hover.png
+ widget/spinner/sp_up_pressed.png
+ WORKING_DIRECTORY ${DefaultTheme_DIR}
+ VERBATIM
+ )
+
+ ADD_CUSTOM_TARGET(${_target_name} ALL
+ DEPENDS ${THEME_BINARY_DIR}/${_name}
+ )
+ENDMACRO()
SET(DefaultTheme_DEFINITION "")
IF (ENABLE_PROGRESS_ELEMENT)
LIST(APPEND DefaultTheme_DEFINITION "-DENABLE_PROGRESS_ELEMENT")
ENDIF ()
-ADD_CUSTOM_COMMAND(
- OUTPUT ${THEME_BINARY_DIR}/${DefaultTheme_RESOURCE_NAME}
- COMMAND ${EDJE_CC_EXECUTABLE} -v ${DefaultTheme_DEFINITION} default.edc ${THEME_BINARY_DIR}/${DefaultTheme_RESOURCE_NAME}
- DEPENDS
- default.edc
- widget/button/button.edc
- widget/button/img_button_focus.png
- widget/button/img_button_hover.png
- widget/button/img_button_normal.png
- widget/button/img_button_press.png
- widget/check/check.edc
- widget/check/img_check_off_focus.png
- widget/check/img_check_off_hover.png
- widget/check/img_check_off.png
- widget/check/img_check_on_focus.png
- widget/check/img_check_on_hover.png
- widget/check/img_check_on.png
- widget/combo/combo.edc
- widget/combo/combo_focus_button.png
- widget/combo/combo_focus.png
- widget/combo/combo_hover_button.png
- widget/combo/combo_hover.png
- widget/combo/combo_normal_button.png
- widget/combo/combo_normal.png
- widget/combo/combo_press_button.png
- widget/combo/combo_press.png
- widget/combo/icon.png
- widget/entry/entry.edc
- widget/entry/img_focused.png
- widget/entry/img_hovered.png
- widget/entry/img_normal.png
- widget/file/file.edc
- widget/file/file_focus.png
- widget/file/file_hover.png
- widget/file/file_normal.png
- widget/file/file_press.png
- widget/mediacontrol/fullscreenbutton/enterfullscreenbutton.png
- widget/mediacontrol/fullscreenbutton/exitfullscreenbutton.png
- widget/mediacontrol/fullscreenbutton/fullscreen_button.edc
- widget/mediacontrol/mutebutton/mute_button.edc
- widget/mediacontrol/mutebutton/mutebutton.png
- widget/mediacontrol/mutebutton/unmutebutton.png
- widget/mediacontrol/playpausebutton/pausebutton.png
- widget/mediacontrol/playpausebutton/playbutton.png
- widget/mediacontrol/playpausebutton/playpause_button.edc
- widget/mediacontrol/seekbackwardbutton/seekbackward_button.edc
- widget/mediacontrol/seekbackwardbutton/seekbackwardbutton.png
- widget/mediacontrol/seekforwardbutton/seekforward_button.edc
- widget/mediacontrol/seekforwardbutton/seekforwardbutton.png
- widget/mediacontrol/togglecaptionsbutton/closedcaption_disabled.png
- widget/mediacontrol/togglecaptionsbutton/closedcaption.png
- widget/mediacontrol/togglecaptionsbutton/toggle_captions_button.edc
- widget/progressbar/bt_base.png
- widget/progressbar/progressbar.edc
- widget/progressbar/shelf_inset.png
- widget/radio/img_radio_off_focus.png
- widget/radio/img_radio_off_hover.png
- widget/radio/img_radio_off.png
- widget/radio/img_radio_on_focus.png
- widget/radio/img_radio_on_hover.png
- widget/radio/img_radio_on.png
- widget/radio/radio.edc
- widget/scrollbar/scrollbar.edc
- widget/scrollbar/scrollbar_h.png
- widget/scrollbar/scrollbar_knob_h.png
- widget/scrollbar/scrollbar_knob_v.png
- widget/scrollbar/scrollbar_v.png
- widget/search/cancel/cancel_normal_button2.png
- widget/search/cancel/cancel_normal_button.png
- widget/search/cancel/search_cancel.edc
- widget/search/decoration/decoration_normal_button.png
- widget/search/decoration/search_decoration.edc
- widget/search/field/field_focused.png
- widget/search/field/field_hovered.png
- widget/search/field/field_normal.png
- widget/search/field/search_field.edc
- widget/slider/slider.edc
- widget/slider/slider_fill_h.png
- widget/slider/slider_fill_v.png
- widget/slider/slider_h.png
- widget/slider/slider_thumb_h.png
- widget/slider/slider_thumb_press_h.png
- widget/slider/slider_thumb_press_v.png
- widget/slider/slider_thumb_v.png
- widget/slider/slider_v.png
- widget/spinner/sp_bg.png
- widget/spinner/sp_down_default.png
- widget/spinner/sp_down_hover.png
- widget/spinner/sp_down_pressed.png
- widget/spinner/spinner.edc
- widget/spinner/sp_up_default.png
- widget/spinner/sp_up_hover.png
- widget/spinner/sp_up_pressed.png
- WORKING_DIRECTORY ${DefaultTheme_DIR}
- VERBATIM
-)
+GENERATE_THEME(DefaultTheme "default.edj" "${DefaultTheme_DEFINITION}")
+INSTALL(FILES "${THEME_BINARY_DIR}/default.edj" DESTINATION ${DATA_INSTALL_DIR}/themes)
-ADD_CUSTOM_TARGET(DefaultTheme ALL
- DEPENDS ${THEME_BINARY_DIR}/${DefaultTheme_RESOURCE_NAME}
-)
-
-INSTALL(FILES ${THEME_BINARY_DIR}/${DefaultTheme_RESOURCE_NAME} DESTINATION ${DATA_INSTALL_DIR}/themes)
+IF (ENABLE_API_TESTS)
+ GENERATE_THEME(BigButtonTheme "big_button_theme.edj" "-DBIG_BUTTON_THEME_FOR_TESTING")
+ENDIF ()
diff --git a/Source/WebKit/efl/DefaultTheme/default.edc b/Source/WebKit/efl/DefaultTheme/default.edc
index e234839d7..2ac69c5c3 100644
--- a/Source/WebKit/efl/DefaultTheme/default.edc
+++ b/Source/WebKit/efl/DefaultTheme/default.edc
@@ -21,14 +21,14 @@
color_classes {
color_class {
- name: "webkit/selection/active";
- color: 255 255 255 255; /* foreground */
- color2: 86 86 209 255; /* background */
+ name: "webkit/selection/foreground";
+ color: 255 255 255 255; /* active */
+ color2: 255 255 255 255; /* inactive */
}
color_class {
- name: "webkit/selection/inactive";
- color: 255 255 255 255; /* foreground */
- color2: 0 0 128 128; /* background */
+ name: "webkit/selection/background";
+ color: 86 86 209 255; /* active */
+ color2: 0 0 128 128; /* inactive */
}
color_class {
name: "webkit/focus_ring";
diff --git a/Source/WebKit/efl/DefaultTheme/widget/button/button.edc b/Source/WebKit/efl/DefaultTheme/widget/button/button.edc
index 78cc72a54..b435ed139 100644
--- a/Source/WebKit/efl/DefaultTheme/widget/button/button.edc
+++ b/Source/WebKit/efl/DefaultTheme/widget/button/button.edc
@@ -113,7 +113,11 @@
}
rel2 {
relative: 1.0 1.0;
+#ifdef BIG_BUTTON_THEME_FOR_TESTING
+ offset: -285 -11;
+#else
offset: -16 -11;
+#endif
}
}
}
diff --git a/Source/WebKit/efl/ewk/ewk_frame.cpp b/Source/WebKit/efl/ewk/ewk_frame.cpp
index dec55d698..af38e4a08 100644
--- a/Source/WebKit/efl/ewk/ewk_frame.cpp
+++ b/Source/WebKit/efl/ewk/ewk_frame.cpp
@@ -30,6 +30,7 @@
#include "DocumentMarkerController.h"
#include "EventHandler.h"
#include "FocusController.h"
+#include "FrameLoadRequest.h"
#include "FrameLoaderClientEfl.h"
#include "FrameView.h"
#include "HTMLCollection.h"
@@ -338,7 +339,7 @@ Eina_Bool ewk_frame_uri_set(Evas_Object* ewkFrame, const char* uri)
WebCore::KURL kurl(WebCore::KURL(), WTF::String::fromUTF8(uri));
WebCore::ResourceRequest req(kurl);
WebCore::FrameLoader* loader = smartData->frame->loader();
- loader->load(req, false);
+ loader->load(WebCore::FrameLoadRequest(smartData->frame, req));
return true;
}
@@ -416,7 +417,7 @@ static Eina_Bool _ewk_frame_contents_set_internal(Ewk_Frame_Smart_Data* smartDat
baseKURL, unreachableKURL);
WebCore::ResourceRequest request(baseKURL);
- smartData->frame->loader()->load(request, substituteData, false);
+ smartData->frame->loader()->load(WebCore::FrameLoadRequest(smartData->frame, request, substituteData));
return true;
}
diff --git a/Source/WebKit/efl/ewk/ewk_view_single.cpp b/Source/WebKit/efl/ewk/ewk_view_single.cpp
index c1fc6cd02..c5779ab3f 100644
--- a/Source/WebKit/efl/ewk/ewk_view_single.cpp
+++ b/Source/WebKit/efl/ewk/ewk_view_single.cpp
@@ -101,10 +101,10 @@ static void _ewk_view_single_smart_resize(Evas_Object* ewkView, Evas_Coord width
}
}
-static inline void _ewk_view_screen_move(uint32_t* image, size_t destinationX, size_t destinationY, size_t sourceX, size_t sourceY, size_t copyWidth, size_t copyHeight, size_t frameWidth)
+static inline void _ewk_view_screen_move(uint32_t* image, size_t destinationX, size_t destinationY, size_t sourceX, size_t sourceY, size_t copyWidth, size_t copyHeight, size_t imageWidth)
{
- uint32_t* sourceBegin = image + (frameWidth * sourceY) + sourceX;
- uint32_t* destinationBegin = image + (frameWidth * destinationY) + destinationX;
+ uint32_t* sourceBegin = image + (imageWidth * sourceY) + sourceX;
+ uint32_t* destinationBegin = image + (imageWidth * destinationY) + destinationX;
size_t copyLength = copyWidth * 4;
const int moveLineUpDown = sourceY >= destinationY ? 1 : -1;
@@ -113,15 +113,15 @@ static inline void _ewk_view_screen_move(uint32_t* image, size_t destinationX, s
uint32_t* source, * destination;
if (sourceX >= destinationX) {
for (size_t i = 0; i < copyHeight; i++) {
- source = sourceBegin + (frameWidth * startHeight);
- destination = destinationBegin + (frameWidth * startHeight);
+ source = sourceBegin + (imageWidth * startHeight);
+ destination = destinationBegin + (imageWidth * startHeight);
startHeight = startHeight + moveLineUpDown;
memcpy(destination, source, copyLength);
}
} else {
for (size_t i = 0; i < copyHeight; i++) {
- source = sourceBegin + (frameWidth * startHeight);
- destination = destinationBegin + (frameWidth * startHeight);
+ source = sourceBegin + (imageWidth * startHeight);
+ destination = destinationBegin + (imageWidth * startHeight);
startHeight = startHeight + moveLineUpDown;
memmove(destination, source, copyLength);
}
@@ -176,7 +176,7 @@ static inline void _ewk_view_single_scroll_process_single(Ewk_View_Smart_Data* s
int copyWidth = scrollWidth - abs(scrollRequest->dx);
int copyHeight = scrollHeight - abs(scrollRequest->dy);
if (scrollRequest->dx || scrollRequest->dy) {
- _ewk_view_screen_move(static_cast<uint32_t*>(pixels), destinationX, destinationY, sourceX, sourceY, copyWidth, copyHeight, scrollWidth);
+ _ewk_view_screen_move(static_cast<uint32_t*>(pixels), destinationX, destinationY, sourceX, sourceY, copyWidth, copyHeight, width);
evas_object_image_data_update_add(smartData->backing_store, destinationX, destinationY, copyWidth, copyHeight);
}
View Lorry Controller Status