[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
mitz at apple.com
mitz at apple.com
Fri Jan 21 15:11:27 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit cdb717dea45db0ad6e2e5787f16fedcb27b2f24d
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Jan 8 22:19:21 2011 +0000
Add WKBundleFrameGetVisibleContentBounds().
https://bugs.webkit.org/show_bug.cgi?id=52089
Patch by Jeff Miller <jeffm at apple.com> on 2011-01-08
Reviewed by Jon Honeycutt.
* WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:
(WKBundleFrameGetVisibleContentBounds):
* WebProcess/InjectedBundle/API/c/WKBundleFrame.h:
Added WKBundleFrameGetVisibleContentBounds().
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75327 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 8b35bd2..7e842c7 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-08 Jeff Miller <jeffm at apple.com>
+
+ Reviewed by Jon Honeycutt.
+
+ Add WKBundleFrameGetVisibleContentBounds().
+ https://bugs.webkit.org/show_bug.cgi?id=52089
+
+ * WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:
+ (WKBundleFrameGetVisibleContentBounds):
+ * WebProcess/InjectedBundle/API/c/WKBundleFrame.h:
+ Added WKBundleFrameGetVisibleContentBounds().
+
2011-01-08 Balazs Kelemen <kbalazs at webkit.org>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp
index 2f53425..9410642 100644
--- a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp
+++ b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp
@@ -147,7 +147,7 @@ bool WKBundleFrameAllowsFollowingLink(WKBundleFrameRef frameRef, WKURLRef urlRef
WKRect WKBundleFrameGetContentBounds(WKBundleFrameRef frameRef)
{
- WKRect contentBounds = { {0, 0}, {0, 0} };
+ WKRect contentBounds = { { 0, 0 }, { 0, 0 } };
Frame* coreFrame = toImpl(frameRef)->coreFrame();
if (!coreFrame)
@@ -163,6 +163,26 @@ WKRect WKBundleFrameGetContentBounds(WKBundleFrameRef frameRef)
return contentBounds;
}
+WKRect WKBundleFrameGetVisibleContentBounds(WKBundleFrameRef frameRef)
+{
+ WKRect visibleContentBounds = { { 0, 0 }, { 0, 0 } };
+
+ Frame* coreFrame = toImpl(frameRef)->coreFrame();
+ if (!coreFrame)
+ return visibleContentBounds;
+
+ FrameView* view = coreFrame->view();
+ if (!view)
+ return visibleContentBounds;
+
+ FloatRect bounds = view->visibleContentRect(true);
+
+ visibleContentBounds.size.width = bounds.width();
+ visibleContentBounds.size.height = bounds.height();
+
+ return visibleContentBounds;
+}
+
WK_EXPORT WKSize WKBundleFrameGetScrollOffset(WKBundleFrameRef frameRef)
{
WKSize scrollOffset = { 0, 0 };
diff --git a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.h b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.h
index 55af2be..a6a20b2 100644
--- a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.h
+++ b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.h
@@ -54,6 +54,7 @@ WK_EXPORT WKBundlePageRef WKBundleFrameGetPage(WKBundleFrameRef frame);
WK_EXPORT bool WKBundleFrameAllowsFollowingLink(WKBundleFrameRef frame, WKURLRef url);
WK_EXPORT WKRect WKBundleFrameGetContentBounds(WKBundleFrameRef frame);
+WK_EXPORT WKRect WKBundleFrameGetVisibleContentBounds(WKBundleFrameRef frame);
WK_EXPORT WKSize WKBundleFrameGetScrollOffset(WKBundleFrameRef frame);
#ifdef __cplusplus
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list