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

[hans at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 557ffc00ab78b89bf92b3a69674236236508b36e
Author: hans at chromium.org <hans at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 8 13:16:48 2010 +0000

    2010-09-08  Hans Wennborg  <hans at chromium.org>
    
            Reviewed by Jeremy Orlow.
    
            Plug leak in WebDeviceOrientationClientMock
            https://bugs.webkit.org/show_bug.cgi?id=45305
    
            WebDeviceOrientationClientMock is responsible for destroying the
            WebDeviceOrientationController object pointed to by the argument
            passed to the setController() member function.
    
            Also use the new WebPrivateOnwPtr for m_clientMock.
    
            * public/WebDeviceOrientationClientMock.h:
            * src/WebDeviceOrientationClientMock.cpp:
            (WebKit::WebDeviceOrientationClientMock::setController):
            (WebKit::WebDeviceOrientationClientMock::initialize):
            (WebKit::WebDeviceOrientationClientMock::reset):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66976 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 90dc536..dd67115 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,22 @@
+2010-09-08  Hans Wennborg  <hans at chromium.org>
+
+        Reviewed by Jeremy Orlow.
+
+        Plug leak in WebDeviceOrientationClientMock
+        https://bugs.webkit.org/show_bug.cgi?id=45305
+
+        WebDeviceOrientationClientMock is responsible for destroying the
+        WebDeviceOrientationController object pointed to by the argument
+        passed to the setController() member function.
+
+        Also use the new WebPrivateOnwPtr for m_clientMock.
+
+        * public/WebDeviceOrientationClientMock.h:
+        * src/WebDeviceOrientationClientMock.cpp:
+        (WebKit::WebDeviceOrientationClientMock::setController):
+        (WebKit::WebDeviceOrientationClientMock::initialize):
+        (WebKit::WebDeviceOrientationClientMock::reset):
+
 2010-09-07  Tony Chang  <tony at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/public/WebDeviceOrientationClientMock.h b/WebKit/chromium/public/WebDeviceOrientationClientMock.h
index fce964b..9cbccf7 100644
--- a/WebKit/chromium/public/WebDeviceOrientationClientMock.h
+++ b/WebKit/chromium/public/WebDeviceOrientationClientMock.h
@@ -28,6 +28,7 @@
 
 #include "WebCommon.h"
 #include "WebDeviceOrientationClient.h"
+#include "WebPrivateOwnPtr.h"
 
 namespace WebCore { class DeviceOrientationClientMock; }
 
@@ -49,7 +50,7 @@ private:
     WEBKIT_API void initialize();
     WEBKIT_API void reset();
 
-    WebCore::DeviceOrientationClientMock* m_clientMock;
+    WebPrivateOwnPtr<WebCore::DeviceOrientationClientMock> m_clientMock;
 };
 
 } // namespace WebKit
diff --git a/WebKit/chromium/src/WebDeviceOrientationClientMock.cpp b/WebKit/chromium/src/WebDeviceOrientationClientMock.cpp
index 4011d12..820c970 100644
--- a/WebKit/chromium/src/WebDeviceOrientationClientMock.cpp
+++ b/WebKit/chromium/src/WebDeviceOrientationClientMock.cpp
@@ -35,6 +35,7 @@ namespace WebKit {
 void WebDeviceOrientationClientMock::setController(WebDeviceOrientationController* controller)
 {
     m_clientMock->setController(controller->controller());
+    delete controller;
 }
 
 void WebDeviceOrientationClientMock::startUpdating()
@@ -59,13 +60,12 @@ void WebDeviceOrientationClientMock::setOrientation(WebDeviceOrientation& orient
 
 void WebDeviceOrientationClientMock::initialize()
 {
-    m_clientMock = new WebCore::DeviceOrientationClientMock();
+    m_clientMock.reset(new WebCore::DeviceOrientationClientMock());
 }
 
 void WebDeviceOrientationClientMock::reset()
 {
-    delete m_clientMock;
-    m_clientMock = 0;
+    m_clientMock.reset(0);
 }
 
 } // namespace WebKit

-- 
WebKit Debian packaging