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

[ossy at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 55034318aee2fe053b732088be176333fc1f8f86
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 31 17:01:22 2010 +0000

    2010-08-31  Csaba Osztrogonác  <ossy at webkit.org>
    
            Reviewed by Antonio Gomes.
    
            [Qt] Fix warnings in WebKit2 directory
            https://bugs.webkit.org/show_bug.cgi?id=44593
    
            * Platform/CoreIPC/qt/ConnectionQt.cpp: Mark unused variables for compiler.
            (CoreIPC::Connection::readyReadHandler):
            (CoreIPC::Connection::sendOutgoingMessage):
            * Shared/qt/WebEventFactoryQt.cpp:
            (WebKit::WebEventFactory::createWebTouchEvent): Initialize state variable. Default case added.
            * WebProcess/Plugins/Netscape/qt/NetscapePluginQt.cpp:
            (WebKit::toNP): Return initialized NPEvent.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66495 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index f4eb5b1..92d0ca1 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-31  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] Fix warnings in WebKit2 directory
+        https://bugs.webkit.org/show_bug.cgi?id=44593
+
+        * Platform/CoreIPC/qt/ConnectionQt.cpp: Mark unused variables for compiler.
+        (CoreIPC::Connection::readyReadHandler):
+        (CoreIPC::Connection::sendOutgoingMessage):
+        * Shared/qt/WebEventFactoryQt.cpp:
+        (WebKit::WebEventFactory::createWebTouchEvent): Initialize state variable. Default case added.
+        * WebProcess/Plugins/Netscape/qt/NetscapePluginQt.cpp:
+        (WebKit::toNP): Return initialized NPEvent.
+
 2010-08-31  Andras Becsi  <abecsi at webkit.org>
 
         Reviewed by Antonio Gomes.
diff --git a/WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp b/WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp
index 3e77e46..1e4c22b 100644
--- a/WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp
+++ b/WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp
@@ -59,7 +59,7 @@ void Connection::readyReadHandler()
     while (m_socket->bytesAvailable()) {
         if (!m_currentMessageSize) {
             size_t numberOfBytesRead = m_socket->read(reinterpret_cast<char*>(m_readBuffer.data()), sizeof(size_t));
-            ASSERT(numberOfBytesRead);
+            ASSERT_UNUSED(numberOfBytesRead, numberOfBytesRead);
             m_currentMessageSize = *reinterpret_cast<size_t*>(m_readBuffer.data());
         }
 
@@ -71,7 +71,7 @@ void Connection::readyReadHandler()
         }
 
         size_t numberOfBytesRead = m_socket->read(reinterpret_cast<char*>(m_readBuffer.data()), m_currentMessageSize);
-        ASSERT(numberOfBytesRead);
+        ASSERT_UNUSED(numberOfBytesRead, numberOfBytesRead);
 
         // The messageID is encoded at the end of the buffer.
         size_t realBufferSize = m_currentMessageSize - sizeof(MessageID);
@@ -125,7 +125,7 @@ bool Connection::sendOutgoingMessage(MessageID messageID, PassOwnPtr<ArgumentEnc
 
     qint64 bytesWritten = m_socket->write(reinterpret_cast<char*>(arguments->buffer()), arguments->bufferSize());
 
-    ASSERT(bytesWritten == arguments->bufferSize());
+    ASSERT_UNUSED(bytesWritten, bytesWritten == arguments->bufferSize());
     return true;
 }
 
diff --git a/WebKit2/Shared/qt/WebEventFactoryQt.cpp b/WebKit2/Shared/qt/WebEventFactoryQt.cpp
index bdd6a23..009a470 100644
--- a/WebKit2/Shared/qt/WebEventFactoryQt.cpp
+++ b/WebKit2/Shared/qt/WebEventFactoryQt.cpp
@@ -173,7 +173,7 @@ WebKeyboardEvent WebEventFactory::createWebKeyboardEvent(QKeyEvent* event)
 WebTouchEvent WebEventFactory::createWebTouchEvent(QTouchEvent* event)
 {
     WebEvent::Type type  = webEventTypeForEvent(event);
-    WebPlatformTouchPoint::TouchPointState state;
+    WebPlatformTouchPoint::TouchPointState state = static_cast<WebPlatformTouchPoint::TouchPointState>(0);
     unsigned int id;
     WebEvent::Modifiers modifiers   = modifiersForEvent(event->modifiers());
     double timestamp                = WTF::currentTime();
@@ -196,6 +196,9 @@ WebTouchEvent WebEventFactory::createWebTouchEvent(QTouchEvent* event)
         case Qt::TouchPointStationary: 
             state = WebPlatformTouchPoint::TouchStationary; 
             break;
+        default:
+            ASSERT_NOT_REACHED();
+            break;
         }
 
         m_touchPoints.append(WebPlatformTouchPoint(id, state, points.at(i).screenPos().toPoint().x(),
diff --git a/WebKit2/WebProcess/Plugins/Netscape/qt/NetscapePluginQt.cpp b/WebKit2/WebProcess/Plugins/Netscape/qt/NetscapePluginQt.cpp
index b8bbb87..3f2ae4f 100644
--- a/WebKit2/WebProcess/Plugins/Netscape/qt/NetscapePluginQt.cpp
+++ b/WebKit2/WebProcess/Plugins/Netscape/qt/NetscapePluginQt.cpp
@@ -47,7 +47,7 @@ void NetscapePlugin::platformPaint(GraphicsContext* context, const IntRect& dirt
 
 NPEvent toNP(const WebMouseEvent& event)
 {
-    NPEvent npEvent;
+    NPEvent npEvent = NPEvent();
 
     notImplemented();
 

-- 
WebKit Debian packaging