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

simon.fraser at apple.com simon.fraser at apple.com
Wed Dec 22 11:19:40 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 9baefa25c8ddff997cbf77af932d634136946406
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 19 17:34:00 2010 +0000

    2010-07-19  Simon Fraser  <simon.fraser at apple.com>
    
            Reviewed by Anders Carlsson.
    
            Uae an OwnPtr for the drawing area in WebPage (fixes a leak!).
    
            * WebProcess/WebPage/WebPage.h:
            (WebKit::WebPage::drawingArea):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63677 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 0aca7d9..1955140 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2010-07-19  Simon Fraser  <simon.fraser at apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        Uae an OwnPtr for the drawing area in WebPage (fixes a leak!).
+
+        * WebProcess/WebPage/WebPage.h:
+        (WebKit::WebPage::drawingArea):
+
 2010-07-19  Anders carlsson  <andersca at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/WebKit2/WebProcess/WebPage/WebPage.h b/WebKit2/WebProcess/WebPage/WebPage.h
index b37e5d5..cafef39 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.h
+++ b/WebKit2/WebProcess/WebPage/WebPage.h
@@ -76,7 +76,7 @@ public:
     void setSize(const WebCore::IntSize&);
     const WebCore::IntSize& size() const { return m_viewSize; }
 
-    DrawingArea* drawingArea() const { return m_drawingArea; }
+    DrawingArea* drawingArea() const { return m_drawingArea.get(); }
 
     // -- Called by the DrawingArea.
     // FIXME: We could genericize these into a DrawingArea client interface. Would that be beneficial?
@@ -130,7 +130,7 @@ private:
     HashMap<uint64_t, WebFrame*> m_frameMap;
 
     WebCore::IntSize m_viewSize;
-    DrawingArea* m_drawingArea;
+    OwnPtr<DrawingArea> m_drawingArea;
 
     InjectedBundlePageLoaderClient m_loaderClient;
     InjectedBundlePageUIClient m_uiClient;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list