Modified: trunk/Source/WebKit2/ChangeLog (136319 => 136320)
--- trunk/Source/WebKit2/ChangeLog 2012-12-02 09:45:48 UTC (rev 136319)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-02 10:12:47 UTC (rev 136320)
@@ -1,3 +1,17 @@
+2012-12-02 Yael Aharon <yael.aha...@intel.com>
+
+ [EFL][WK2] MiniBrowser should have a legacy mode
+ https://bugs.webkit.org/show_bug.cgi?id=103679
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ We need a way to create a web view in legacy mode, while still using the default context.
+ WKViewCreate creates a legacy view, so change it to create a default context if a context
+ was not passed.
+
+ * UIProcess/API/efl/ewk_view.cpp:
+ (ewk_view_base_add):
+
2012-12-01 Tim Horton <timothy_hor...@apple.com>
PDFPlugin: Support PDF form editing in <iframe>s
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp (136319 => 136320)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp 2012-12-02 09:45:48 UTC (rev 136319)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp 2012-12-02 10:12:47 UTC (rev 136320)
@@ -518,7 +518,7 @@
*/
Evas_Object* ewk_view_base_add(Evas* canvas, WKContextRef contextRef, WKPageGroupRef pageGroupRef, EwkViewImpl::ViewBehavior behavior)
{
- return createEwkView(canvas, createEwkViewSmartClass(), EwkContext::create(toImpl(contextRef)), pageGroupRef, behavior);
+ return createEwkView(canvas, createEwkViewSmartClass(), contextRef ? EwkContext::create(toImpl(contextRef)) : EwkContext::defaultContext(), pageGroupRef, behavior);
}
Evas_Object* ewk_view_smart_add(Evas* canvas, Evas_Smart* smart, Ewk_Context* context)
Modified: trunk/Tools/ChangeLog (136319 => 136320)
--- trunk/Tools/ChangeLog 2012-12-02 09:45:48 UTC (rev 136319)
+++ trunk/Tools/ChangeLog 2012-12-02 10:12:47 UTC (rev 136320)
@@ -1,3 +1,16 @@
+2012-12-02 Yael Aharon <yael.aha...@intel.com>
+
+ [EFL][WK2] MiniBrowser should have a legacy mode
+ https://bugs.webkit.org/show_bug.cgi?id=103679
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Add an option to start MiniBrowser in legacy mode.
+
+ * MiniBrowser/efl/main.c:
+ (window_create):
+ (elm_main):
+
2012-12-02 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r136236.
Modified: trunk/Tools/MiniBrowser/efl/main.c (136319 => 136320)
--- trunk/Tools/MiniBrowser/efl/main.c 2012-12-02 09:45:48 UTC (rev 136319)
+++ trunk/Tools/MiniBrowser/efl/main.c 2012-12-02 10:12:47 UTC (rev 136320)
@@ -47,6 +47,7 @@
/* Default value of device_pixel_ratio is '0' so that we don't set custom device
* scale factor unless it's required by the User. */
static double device_pixel_ratio = 0;
+static Eina_Bool legacy_behavior_enabled = EINA_FALSE;
static Ewk_View_Smart_Class *miniBrowserViewSmartClass()
{
@@ -87,6 +88,8 @@
('e', "engine", "ecore-evas engine to use."),
ECORE_GETOPT_STORE_STR
('s', "window-size", "window size in following format (width)x(height)."),
+ ECORE_GETOPT_STORE_DEF_BOOL
+ ('b', "legacy", "Legacy mode", EINA_FALSE),
ECORE_GETOPT_STORE_DOUBLE
('r', "device-pixel-ratio", "Ratio between the CSS units and device pixels."),
ECORE_GETOPT_CALLBACK_NOARGS
@@ -1056,8 +1059,13 @@
ewkViewClass->window_close = on_window_close;
Evas *evas = evas_object_evas_get(window->elm_window);
- Evas_Smart *smart = evas_smart_class_new(&ewkViewClass->sc);
- window->ewk_view = ewk_view_smart_add(evas, smart, ewk_context_default_get());
+ if (legacy_behavior_enabled) {
+ // Use raw WK2 api to create a view using legacy mode.
+ window->ewk_view = (Evas_Object*)WKViewCreate(evas, 0, 0);
+ } else {
+ Evas_Smart *smart = evas_smart_class_new(&ewkViewClass->sc);
+ window->ewk_view = ewk_view_smart_add(evas, smart, ewk_context_default_get());
+ }
ewk_view_theme_set(window->ewk_view, THEME_DIR "/default.edj");
if (device_pixel_ratio)
ewk_view_device_pixel_ratio_set(window->ewk_view, (float)device_pixel_ratio);
@@ -1140,6 +1148,7 @@
Ecore_Getopt_Value values[] = {
ECORE_GETOPT_VALUE_STR(evas_engine_name),
ECORE_GETOPT_VALUE_STR(window_size_string),
+ ECORE_GETOPT_VALUE_STR(legacy_behavior_enabled),
ECORE_GETOPT_VALUE_DOUBLE(device_pixel_ratio),
ECORE_GETOPT_VALUE_BOOL(quitOption),
ECORE_GETOPT_VALUE_BOOL(encoding_detector_enabled),
