Changeset 69650 in webkit

Timestamp:

Oct 13, 2010 5:14:58 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-10-13 Gyuyoung Kim <​gyuyoung.kim@samsung.com>

Reviewed by Kenneth Rohde Christiansen.

[EFL] Support viewport configuration and add new arguments for WebKit EFL
​https://bugs.webkit.org/show_bug.cgi?id=47084

Opera spec regarding to viewport meta tag was adjusted to WebCore. So, EFL port
needs to be modified according to the changes.

• WebCoreSupport/ChromeClientEfl.cpp: (WebCore::ChromeClientEfl::dispatchViewportDataDidChange):
• WebCoreSupport/FrameLoaderClientEfl.cpp: (WebCore::FrameLoaderClientEfl::dispatchDidCommitLoad):
• ewk/ewk_private.h:
• ewk/ewk_view.cpp: (_ewk_view_priv_new): (_ewk_view_viewport_attributes_compute): (ewk_view_viewport_attributes_set): (ewk_view_viewport_attributes_get): (ewk_view_device_pixel_ratio_get):
• ewk/ewk_view.h:

2010-10-13 Gyuyoung Kim <​gyuyoung.kim@samsung.com>

Reviewed by Kenneth Rohde Christiansen.

[EFL] Support viewport configuration and add new arguments for WebKit EFL
​https://bugs.webkit.org/show_bug.cgi?id=47084

Opera spec regarding to viewport meta tag was adjusted to WebCore. So, EFL port
needs to be modified according to the changes.

• EWebLauncher/main.c: (on_viewport_changed):

Location:

trunk

Files:

• WebKit/efl/ChangeLog (modified) (1 diff)
• WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp (modified) (1 diff)
• WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp (modified) (1 diff)
• WebKit/efl/ewk/ewk_private.h (modified) (1 diff)
• WebKit/efl/ewk/ewk_view.cpp (modified) (10 diffs)
• WebKit/efl/ewk/ewk_view.h (modified) (2 diffs)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/EWebLauncher/main.c (modified) (4 diffs)

trunk/WebKit/efl/ChangeLog

@@ +1 @@
+2010-10-13  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [EFL] Support viewport configuration and add new arguments for WebKit EFL
+        https://bugs.webkit.org/show_bug.cgi?id=47084
+
+        Opera spec regarding to viewport meta tag was adjusted to WebCore. So, EFL port 
+        needs to be modified according to the changes.
+
+        * WebCoreSupport/ChromeClientEfl.cpp:
+        (WebCore::ChromeClientEfl::dispatchViewportDataDidChange):
+        * WebCoreSupport/FrameLoaderClientEfl.cpp:
+        (WebCore::FrameLoaderClientEfl::dispatchDidCommitLoad):
+        * ewk/ewk_private.h:
+        * ewk/ewk_view.cpp:
+        (_ewk_view_priv_new):
+        (_ewk_view_viewport_attributes_compute):
+        (ewk_view_viewport_attributes_set):
+        (ewk_view_viewport_attributes_get):
+        (ewk_view_device_pixel_ratio_get):
+        * ewk/ewk_view.h:
+
 2010-10-12  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 

trunk/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp

@@ -520 +520 @@
 void ChromeClientEfl::dispatchViewportDataDidChange(const ViewportArguments& arguments) const
 {
-    ewk_view_viewport_set(m_view, arguments.width, arguments.height, arguments.initialScale, arguments.minimumScale, arguments.maximumScale, arguments.userScalable);
+    ewk_view_viewport_attributes_set(m_view, arguments);
 }
 

trunk/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp

@@ -622 +622 @@
 
     ViewportArguments arguments;
-    ewk_view_viewport_set(m_view, arguments.width, arguments.height, arguments.initialScale, arguments.minimumScale, arguments.maximumScale, arguments.userScalable);
+    ewk_view_viewport_attributes_set(m_view, arguments);
 }
 

trunk/WebKit/efl/ewk/ewk_private.h

@@ -103 +103 @@
 
 void ewk_view_popup_new(Evas_Object *o, WebCore::PopupMenuClient* client, int selected, const WebCore::IntRect& rect);
-void ewk_view_viewport_set(Evas_Object *o, float w, float h, float init_scale, float max_scale, float min_scale, float user_scalable);
+void ewk_view_viewport_attributes_set(Evas_Object *o, const WebCore::ViewportArguments& arguments);
 
 void ewk_view_download_request(Evas_Object *o, Ewk_Download *download);

trunk/WebKit/efl/ewk/ewk_view.cpp

@@ -23 +23 @@
 #include "ewk_view.h"
 
-#include "appcache/ApplicationCacheStorage.h"
+#include "Chrome.h"
 #include "ChromeClientEfl.h"
 #include "ContextMenuClientEfl.h"
@@ -43 +43 @@
 #include "PopupMenuClient.h"
 #include "ProgressTracker.h"
+#include "appcache/ApplicationCacheStorage.h"
 #include "ewk_private.h"
 
@@ -59 +60 @@
 #define ZOOM_MAX (4.0)
 
+#define DEVICE_PIXEL_RATIO (1.0)
+
 static const char EWK_VIEW_TYPE_STR[] = "EWK_View";
 
@@ -73 +76 @@
     WebCore::Settings* page_settings;
     WebCore::Frame* main_frame;
+    WebCore::ViewportArguments viewport_arguments;
     Ewk_History* history;
     struct {
@@ -121 +125 @@
         Eina_Bool page_cache: 1;
         struct {
-            float w;
-            float h;
-            float init_scale;
-            float min_scale;
-            float max_scale;
-            float user_scalable;
-        } viewport;
-        struct {
             float min_scale;
             float max_scale;
             Eina_Bool user_scalable:1;
         } zoom_range;
+        float device_pixel_ratio;
     } settings;
     struct {
@@ -625 +622 @@
     priv->settings.zoom_range.max_scale = ZOOM_MAX;
     priv->settings.zoom_range.user_scalable = EINA_TRUE;
+    priv->settings.device_pixel_ratio = DEVICE_PIXEL_RATIO;
 
     priv->main_frame = _ewk_view_core_frame_new(sd, priv, 0).get();
@@ -966 +964 @@
     priv->animated_zoom.animator = ecore_animator_add
         (_ewk_view_zoom_animator_cb, sd);
+}
+
+static WebCore::ViewportAttributes _ewk_view_viewport_attributes_compute(Evas_Object* o)
+{
+    EWK_VIEW_SD_GET(o, sd);
+    EWK_VIEW_PRIV_GET(sd, priv);
+
+    int desktop_width = 980;
+    int device_dpi = 160;
+
+    int available_width = (int) priv->page->chrome()->client()->pageRect().width();
+    int available_height = (int) priv->page->chrome()->client()->pageRect().height();
+
+    int device_width = (int) priv->page->chrome()->client()->windowRect().width();
+    int device_height = (int) priv->page->chrome()->client()->windowRect().height();
+
+    IntSize available_size = IntSize(available_width, available_height);
+    WebCore::ViewportAttributes attributes = WebCore::computeViewportAttributes(priv->viewport_arguments, desktop_width, device_width, device_height, device_dpi, available_size);
+
+    return attributes;
 }
 
@@ -4050 +4068 @@
  * Reports the viewport has changed.
  *
- * @param o view.
- * @param w width.
- * @param h height.
- * @param init_scale initialScale value.
- * @param max_scale maximumScale value.
- * @param min_scale minimumScale value.
- * @param user_scalable userscalable flag.
+ * @param arguments viewport argument.
  *
  * Emits signal: "viewport,changed" with no parameters.
  */
-void ewk_view_viewport_set(Evas_Object *o, float w, float h, float init_scale, float max_scale, float min_scale, float user_scalable)
+void ewk_view_viewport_attributes_set(Evas_Object *o, const WebCore::ViewportArguments& arguments)
 {
     EWK_VIEW_SD_GET(o, sd);
     EWK_VIEW_PRIV_GET(sd, priv);
-
-    priv->settings.viewport.w = w;
-    priv->settings.viewport.h = h;
-    priv->settings.viewport.init_scale = init_scale;
-    priv->settings.viewport.min_scale = min_scale;
-    priv->settings.viewport.max_scale = max_scale;
-    priv->settings.viewport.user_scalable = user_scalable;
-
+    
+    priv->viewport_arguments = arguments;
     evas_object_smart_callback_call(o, "viewport,changed", 0);
 }
 
 /**
- * Gets data of viewport meta tag.
+ * Gets attributes of viewport meta tag.
  *
  * @param o view.
@@ -4084 +4090 @@
  * @param max_scale maximum Scale value.
  * @param min_scale minimum Scale value.
+ * @param device_pixel_ratio value.
  * @param user_scalable user Scalable value.
  */
-void ewk_view_viewport_get(Evas_Object *o, float* w, float* h, float* init_scale, float* max_scale, float* min_scale, float* user_scalable)
-{
-    EWK_VIEW_SD_GET(o, sd);
-    EWK_VIEW_PRIV_GET(sd, priv);
+void ewk_view_viewport_attributes_get(Evas_Object *o, float* w, float* h, float* init_scale, float* max_scale, float* min_scale, float* device_pixel_ratio, Eina_Bool* user_scalable)
+{
+    WebCore::ViewportAttributes attributes = _ewk_view_viewport_attributes_compute(o);
 
     if (w)
-        *w = priv->settings.viewport.w;
+        *w = attributes.layoutSize.width();
     if (h)
-        *h = priv->settings.viewport.h;
+        *h = attributes.layoutSize.height();
     if (init_scale)
-        *init_scale = priv->settings.viewport.init_scale;
+        *init_scale = attributes.initialScale;
     if (max_scale)
-        *max_scale = priv->settings.viewport.max_scale;
+        *max_scale = attributes.maximumScale;
     if (min_scale)
-        *min_scale = priv->settings.viewport.min_scale;
+        *min_scale = attributes.minimumScale;
+    if (device_pixel_ratio)
+        *device_pixel_ratio = attributes.devicePixelRatio;
     if (user_scalable)
-        *user_scalable = priv->settings.viewport.user_scalable;
+        *user_scalable = attributes.userScalable;
 }
 
@@ -4192 +4200 @@
 
 /**
+ * Gets device pixel ratio value.
+ *
+ * @param o view.
+ * @param user_scalable where to return the current user scalable value.
+ *
+ * @return @c EINA_TRUE if zoom is enabled, @c EINA_FALSE if not.
+ */
+float ewk_view_device_pixel_ratio_get(Evas_Object* o)
+{
+    EWK_VIEW_SD_GET(o, sd);
+    EWK_VIEW_PRIV_GET(sd, priv);
+
+    return priv->settings.device_pixel_ratio;
+}
+
+/**
  * @internal
  * Reports a requeset will be loaded. It's client responsibility to decide if

trunk/WebKit/efl/ewk/ewk_view.h

@@ -490 +490 @@
 EAPI Eina_Bool ewk_view_paint_contents(Ewk_View_Private_Data *priv, cairo_t *cr, const Eina_Rectangle *area);
 
-EAPI void ewk_view_viewport_get(Evas_Object *o, float* w, float* h, float* init_scale, float* max_scale, float* min_scale, float* user_scalable);
+EAPI void ewk_view_viewport_attributes_get(Evas_Object *o, float* w, float* h, float* init_scale, float* max_scale, float* min_scale, float* device_pixel_ratio , Eina_Bool* user_scalable);
 EAPI Eina_Bool ewk_view_zoom_range_set(Evas_Object* o, float min_scale, float max_scale);
 EAPI float ewk_view_zoom_range_min_get(Evas_Object* o);
@@ -496 +496 @@
 EAPI void ewk_view_user_scalable_set(Evas_Object* o, Eina_Bool user_scalable);
 EAPI Eina_Bool ewk_view_user_scalable_get(Evas_Object* o);
+EAPI float ewk_view_device_pixel_ratio_get(Evas_Object* o);
 
 #ifdef __cplusplus

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-10-13  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [EFL] Support viewport configuration and add new arguments for WebKit EFL
+        https://bugs.webkit.org/show_bug.cgi?id=47084
+
+        Opera spec regarding to viewport meta tag was adjusted to WebCore. So, EFL port
+        needs to be modified according to the changes.
+
+        * EWebLauncher/main.c:
+        (on_viewport_changed):
+
 2010-10-12  Dirk Pranke  <dpranke@chromium.org>
 

trunk/WebKitTools/EWebLauncher/main.c

@@ -133 +133 @@
     float minScale;
     float maxScale;
+    float devicePixelRatio;
     Eina_Bool userScalable;
 } Viewport;
@@ -403 +404 @@
     ELauncher *app = (ELauncher *)user_data;
 
-    float w, h, initScale, minScale, maxScale, userScalable;
-
-    ewk_view_viewport_get(webview, &w, &h, &initScale, &maxScale, &minScale, &userScalable);
+    float w, h, initScale, minScale, maxScale, devicePixelRatio;
+    Eina_Bool userScalable;
+
+    ewk_view_viewport_attributes_get(webview, &w, &h, &initScale, &maxScale, &minScale, &devicePixelRatio, &userScalable);
 
     /**
@@ -420 +422 @@
     if ((int)maxScale == -1)
         maxScale = ewk_view_zoom_range_max_get(webview);
+    if ((int)devicePixelRatio == -1)
+        devicePixelRatio = ewk_view_device_pixel_ratio_get(webview);
     if ((int)userScalable == -1)
         userScalable = EINA_TRUE;
@@ -428 +432 @@
     app->viewport.minScale = minScale;
     app->viewport.maxScale = maxScale;
-    app->viewport.userScalable = (Eina_Bool)userScalable;
+    app->viewport.devicePixelRatio = devicePixelRatio;
+    app->viewport.userScalable = userScalable;
     viewport_set();
 }