[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 13663bd1f7d8846e81994e037bf346716a675507
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 12 22:36:17 2010 +0000

    2010-10-12  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [EFL] Add a method to get target's dpi value
            https://bugs.webkit.org/show_bug.cgi?id=47537
    
            Add a method to get target dpi value using Ecore_X.
            When we set layout size, we need to use the dpi value.
    
            * ewk/ewk_private.h:
            * ewk/ewk_view.cpp:
            (ewk_view_page_rect_get):
            (ewk_view_dpi_get):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69613 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
index 1c143a2..0479955 100644
--- a/WebKit/efl/ChangeLog
+++ b/WebKit/efl/ChangeLog
@@ -1,3 +1,18 @@
+2010-10-12  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [EFL] Add a method to get target's dpi value
+        https://bugs.webkit.org/show_bug.cgi?id=47537
+
+        Add a method to get target dpi value using Ecore_X.
+        When we set layout size, we need to use the dpi value.
+
+        * ewk/ewk_private.h:
+        * ewk/ewk_view.cpp:
+        (ewk_view_page_rect_get):
+        (ewk_view_dpi_get):
+
 2010-10-07  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
 
         Reviewed by Antonio Gomes.
diff --git a/WebKit/efl/ewk/ewk_private.h b/WebKit/efl/ewk/ewk_private.h
index 185a7e1..fc973f1 100644
--- a/WebKit/efl/ewk/ewk_private.h
+++ b/WebKit/efl/ewk/ewk_private.h
@@ -106,6 +106,8 @@ void ewk_view_viewport_set(Evas_Object *o, float w, float h, float init_scale, f
 
 void ewk_view_download_request(Evas_Object *o, Ewk_Download *download);
 
+int ewk_view_dpi_get();
+
 Ewk_History *ewk_history_new(WebCore::BackForwardList *history);
 void ewk_history_free(Ewk_History *history);
 
diff --git a/WebKit/efl/ewk/ewk_view.cpp b/WebKit/efl/ewk/ewk_view.cpp
index af40f93..06e8a85 100644
--- a/WebKit/efl/ewk/ewk_view.cpp
+++ b/WebKit/efl/ewk/ewk_view.cpp
@@ -51,6 +51,10 @@
 #include <inttypes.h>
 #include <sys/time.h>
 
+#ifdef HAVE_ECORE_X
+#include <Ecore_X.h>
+#endif
+
 #define ZOOM_MIN (0.05)
 #define ZOOM_MAX (4.0)
 
@@ -4241,3 +4245,18 @@ WebCore::FloatRect ewk_view_page_rect_get(Evas_Object *o)
     WebCore::Frame* main_frame = priv->page->mainFrame();
     return main_frame->view()->frameRect();
 } 
+
+/**
+ * @internal
+ * Gets dpi value.
+ *
+ * @return device's dpi value.
+ */
+int ewk_view_dpi_get()
+{
+#ifdef HAVE_ECORE_X
+     return ecore_x_dpi_get();
+#else
+     return 160;
+#endif
+}

-- 
WebKit Debian packaging