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

[andersca at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 8a3e93d99b1112bc9b39270746bcf7be4b29e71d
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 18 18:02:24 2010 +0000

    Use nullptr instead of 0.
    
    Reviewed by Darin Adler.
    
    * UIProcess/API/mac/FindIndicatorWindow.mm:
    (WebKit::FindIndicatorWindow::closeWindow):
    * UIProcess/API/mac/WKView.mm:
    (-[WKView renewGState]):
    * WebProcess/Plugins/PluginProcessConnection.cpp:
    (WebKit::PluginProcessConnection::removePluginProxy):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69973 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 61f13cf..b7a4829 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-18  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Darin Adler.
+
+        Use nullptr instead of 0.
+
+        * UIProcess/API/mac/FindIndicatorWindow.mm:
+        (WebKit::FindIndicatorWindow::closeWindow):
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView renewGState]):
+        * WebProcess/Plugins/PluginProcessConnection.cpp:
+        (WebKit::PluginProcessConnection::removePluginProxy):
+
 2010-10-15  Sam Weinig  <sam at webkit.org>
 
         Fix Qt build.
diff --git a/WebKit2/UIProcess/API/mac/FindIndicatorWindow.mm b/WebKit2/UIProcess/API/mac/FindIndicatorWindow.mm
index 693a791..23b88ca 100644
--- a/WebKit2/UIProcess/API/mac/FindIndicatorWindow.mm
+++ b/WebKit2/UIProcess/API/mac/FindIndicatorWindow.mm
@@ -173,12 +173,12 @@ void FindIndicatorWindow::closeWindow()
 
     if (m_fadeOutAnimation) {
         [m_fadeOutAnimation.get() stopAnimation];
-        m_fadeOutAnimation = 0;
+        m_fadeOutAnimation = nullptr;
     }
 
     [[m_findIndicatorWindow.get() parentWindow] removeChildWindow:m_findIndicatorWindow.get()];
     [m_findIndicatorWindow.get() close];
-    m_findIndicatorWindow = 0;
+    m_findIndicatorWindow = nullptr;
 }
 
 void FindIndicatorWindow::startFadeOutTimerFired()
diff --git a/WebKit2/UIProcess/API/mac/WKView.mm b/WebKit2/UIProcess/API/mac/WKView.mm
index eb01542..02deb6f 100644
--- a/WebKit2/UIProcess/API/mac/WKView.mm
+++ b/WebKit2/UIProcess/API/mac/WKView.mm
@@ -181,7 +181,7 @@ struct EditCommandState {
 - (void)renewGState
 {
     // Hide the find indicator.
-    _data->_findIndicatorWindow = 0;
+    _data->_findIndicatorWindow = nullptr;
 
     [super renewGState];
 }
diff --git a/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp b/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp
index 534d2e4..cb4facd 100644
--- a/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp
+++ b/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp
@@ -62,7 +62,7 @@ void PluginProcessConnection::removePluginProxy(PluginProxy* plugin)
     // We have no more plug-ins, invalidate the connection to the plug-in process.
     ASSERT(m_connection);
     m_connection->invalidate();
-    m_connection = 0;
+    m_connection = nullptr;
 
     // This will cause us to be deleted.
     m_pluginProcessConnectionManager->removePluginProcessConnection(this);

-- 
WebKit Debian packaging