[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 14:25:08 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit d7bc337a72fb4f4e7b445c91ad6d8bc146188b4e
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 8 04:43:35 2010 +0000
2010-10-07 Gyuyoung Kim <gyuyoung.kim at samsung.com>
Reviewed by Antonio Gomes.
[EFL] Implement pageRect() function
https://bugs.webkit.org/show_bug.cgi?id=47395
Implement pageRect() in ChromeClientEfl using frameRect().
* CMakeListsEfl.txt:
* WebCoreSupport/ChromeClientEfl.cpp:
(WebCore::ChromeClientEfl::pageRect):
* ewk/ewk_private.h:
* ewk/ewk_view.cpp:
(ewk_view_page_rect_get): Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69376 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
index 5b4230d..1c143a2 100644
--- a/WebKit/efl/ChangeLog
+++ b/WebKit/efl/ChangeLog
@@ -1,3 +1,19 @@
+2010-10-07 Gyuyoung Kim <gyuyoung.kim at samsung.com>
+
+ Reviewed by Antonio Gomes.
+
+ [EFL] Implement pageRect() function
+ https://bugs.webkit.org/show_bug.cgi?id=47395
+
+ Implement pageRect() in ChromeClientEfl using frameRect().
+
+ * CMakeListsEfl.txt:
+ * WebCoreSupport/ChromeClientEfl.cpp:
+ (WebCore::ChromeClientEfl::pageRect):
+ * ewk/ewk_private.h:
+ * ewk/ewk_view.cpp:
+ (ewk_view_page_rect_get): Added.
+
2010-10-06 Ryuan Choi <ryuan.choi at samsung.com>
Reviewed by Antonio Gomes.
diff --git a/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp b/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp
index 1f1c1ec..01f2131 100644
--- a/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp
+++ b/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp
@@ -118,8 +118,10 @@ void ChromeClientEfl::setWindowRect(const FloatRect& rect)
FloatRect ChromeClientEfl::pageRect()
{
- notImplemented();
- return FloatRect();
+ if (!m_view)
+ return FloatRect();
+
+ return ewk_view_page_rect_get(m_view);
}
float ChromeClientEfl::scaleFactor()
diff --git a/WebKit/efl/ewk/ewk_private.h b/WebKit/efl/ewk/ewk_private.h
index 5b89b8c..185a7e1 100644
--- a/WebKit/efl/ewk/ewk_private.h
+++ b/WebKit/efl/ewk/ewk_private.h
@@ -152,6 +152,8 @@ Eina_Bool ewk_view_navigation_policy_decision(Evas_Object* o, Ewk_Frame_Resource
void ewk_view_contents_size_changed(Evas_Object *o, Evas_Coord w, Evas_Coord h);
+WebCore::FloatRect ewk_view_page_rect_get(Evas_Object *o);
+
#ifdef __cplusplus
}
diff --git a/WebKit/efl/ewk/ewk_view.cpp b/WebKit/efl/ewk/ewk_view.cpp
index f72a9e7..af40f93 100644
--- a/WebKit/efl/ewk/ewk_view.cpp
+++ b/WebKit/efl/ewk/ewk_view.cpp
@@ -4224,3 +4224,20 @@ void ewk_view_contents_size_changed(Evas_Object *o, int w, int h)
if (!sd->api->contents_resize(sd, w, h))
ERR("failed to resize contents to %dx%d", w, h);
}
+
+/**
+ * @internal
+ * Gets page size from frameview.
+ *
+ * @param o view.
+ *
+ * @return page size.
+ */
+WebCore::FloatRect ewk_view_page_rect_get(Evas_Object *o)
+{
+ EWK_VIEW_SD_GET(o, sd);
+ EWK_VIEW_PRIV_GET(sd, priv);
+
+ WebCore::Frame* main_frame = priv->page->mainFrame();
+ return main_frame->view()->frameRect();
+}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list