[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
jberlin at webkit.org
jberlin at webkit.org
Wed Dec 22 13:41:45 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit d83f5139769e9bb7e3feaa158c1e9593d44155ec
Author: jberlin at webkit.org <jberlin at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 23 17:37:24 2010 +0000
Expose the BundlePage on the BundleFrame in the API.
https://bugs.webkit.org/show_bug.cgi?id=46366
Reviewed by Sam Weinig.
* WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:
(WKBundleFrameGetPage):
* WebProcess/InjectedBundle/API/c/WKBundleFrame.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68162 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index b5a90a2..d59801b 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-23 Jessie Berlin <jberlin at apple.com>
+
+ Reviewed by Sam Weinig.
+
+ Expose the BundlePage on the BundleFrame in the API.
+ https://bugs.webkit.org/show_bug.cgi?id=46366
+
+ * WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:
+ (WKBundleFrameGetPage):
+ * WebProcess/InjectedBundle/API/c/WKBundleFrame.h:
+
2010-09-23 Kenneth Rohde Christiansen <kenneth.christiansen at openbossa.org>
Reviewed by Andreas Kling.
diff --git a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp
index aaba297..ffc46a1 100644
--- a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp
+++ b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp
@@ -113,3 +113,8 @@ unsigned WKBundleFrameGetPendingUnloadCount(WKBundleFrameRef frameRef)
{
return toWK(frameRef)->pendingUnloadCount();
}
+
+WKBundlePageRef WKBundleFrameGetPage(WKBundleFrameRef frameRef)
+{
+ return toRef(toWK(frameRef)->page());
+}
diff --git a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.h b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.h
index 6a2cf00..b9d700d 100644
--- a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.h
+++ b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.h
@@ -48,6 +48,8 @@ WK_EXPORT JSGlobalContextRef WKBundleFrameGetJavaScriptContextForWorld(WKBundleF
WK_EXPORT JSValueRef WKBundleFrameGetJavaScriptWrapperForNodeForWorld(WKBundleFrameRef frame, WKBundleNodeHandleRef nodeHandle, WKBundleScriptWorldRef world);
WK_EXPORT JSValueRef WKBundleFrameGetJavaScriptWrapperForRangeForWorld(WKBundleFrameRef frame, WKBundleRangeHandleRef rangeHandle, WKBundleScriptWorldRef world);
+WK_EXPORT WKBundlePageRef WKBundleFrameGetPage(WKBundleFrameRef frame);
+
#ifdef __cplusplus
}
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list