WKBundlePageRenderTreeExternalRepresentation really needs to be

WKBundlePageCopyRenderTreeExternalRepresentation so we don't have dangling
pointers and adhere to naming conventions.

Reviewed by Anders Carlsson.

* WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
(WKBundlePageCopyRenderTreeExternalRepresentation):
* WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h:
* mac/WebKit2.exp:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@61876 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 8a6ea8efc85a4411cb4728d2977d98c01ed7b463..5155dfaa5b76c2d61aa08e80590a728d0fd36afb 100644 (file)
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2010-06-25  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Anders Carlsson.
+
+        WKBundlePageRenderTreeExternalRepresentation really needs to be 
+        WKBundlePageCopyRenderTreeExternalRepresentation so we don't have dangling
+        pointers and adhere to naming conventions.
+
+        * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
+        (WKBundlePageCopyRenderTreeExternalRepresentation):
+        * WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h:
+        * mac/WebKit2.exp:
+
 2010-06-24  Steve Falkenburg  <sfalken@apple.com>
 
         Windows build fix.

diff --git a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
index ee43f16877b63a25b0ca0fac1c71600decc542e6..34e7abbb77d3cb5f9807636ff7e98ca2e846a794 100644 (file)
--- a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
+++ b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
@@ -44,7 +44,9 @@ WKURLRef WKBundlePageGetMainFrameURL(WKBundlePageRef pageRef)
     return toURLRef(toWK(pageRef)->mainFrameURL().impl());
 }
 
-WKStringRef WKBundlePageRenderTreeExternalRepresentation(WKBundlePageRef pageRef)
+WKStringRef WKBundlePageCopyRenderTreeExternalRepresentation(WKBundlePageRef pageRef)
 {
-    return toRef(toWK(pageRef)->renderTreeExternalRepresentation().impl());
+    WebCore::StringImpl* string = toWK(pageRef)->renderTreeExternalRepresentation().impl();
+    string->ref();
+    return toRef(string);
 }

diff --git a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h
index 7ecb212b58f4294e0660f94c1c84f272eb68c65a..e738d4c680b18d8ce0eb5ae06d710d1e1ac30040 100644 (file)
--- a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h
+++ b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h
@@ -33,7 +33,7 @@
 extern "C" {
 #endif
 
-WK_EXPORT WKStringRef WKBundlePageRenderTreeExternalRepresentation(WKBundlePageRef page);
+WK_EXPORT WKStringRef WKBundlePageCopyRenderTreeExternalRepresentation(WKBundlePageRef page);
 
 #ifdef __cplusplus
 }

diff --git a/WebKit2/mac/WebKit2.exp b/WebKit2/mac/WebKit2.exp
index 71f622e68b248bde3d81121753d86b57a000bd91..2144074abf1e0b79c251bfc461f6dae381c2143a 100644 (file)
--- a/WebKit2/mac/WebKit2.exp
+++ b/WebKit2/mac/WebKit2.exp
@@ -1,6 +1,6 @@
 .objc_class_name_WKView
+_WKBundlePageCopyRenderTreeExternalRepresentation
 _WKBundlePageGetMainFrameURL
-_WKBundlePageRenderTreeExternalRepresentation
 _WKBundlePageSetClient
 _WKBundlePostMessage
 _WKBundleSetClient