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

[tkent at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 0c36fadaaa9ee3eb11091fe113048b2d989b1141
Author: tkent at chromium.org <tkent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 14 06:51:34 2010 +0000

    2010-09-13  Yuta Kitamura  <yutak at chromium.org>
    
            Reviewed by Kent Tamura.
    
            Add one #if guard block to fix Qt builds.
    
            Web Inspector: WebSocket in Resources tab
            https://bugs.webkit.org/show_bug.cgi?id=40768
    
            * inspector/InspectorResource.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67448 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c03ca8d..6319869 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,16 @@
 2010-09-13  Yuta Kitamura  <yutak at chromium.org>
 
+        Reviewed by Kent Tamura.
+
+        Add one #if guard block to fix Qt builds.
+
+        Web Inspector: WebSocket in Resources tab
+        https://bugs.webkit.org/show_bug.cgi?id=40768
+
+        * inspector/InspectorResource.cpp:
+
+2010-09-13  Yuta Kitamura  <yutak at chromium.org>
+
         Reviewed by Pavel Feldman.
 
         Add WebSocket resource type to Web Inspector.
diff --git a/WebCore/inspector/InspectorResource.cpp b/WebCore/inspector/InspectorResource.cpp
index 0a4784d..9bc01c8 100644
--- a/WebCore/inspector/InspectorResource.cpp
+++ b/WebCore/inspector/InspectorResource.cpp
@@ -52,6 +52,7 @@
 
 namespace WebCore {
 
+#if ENABLE(WEB_SOCKETS)
 // Create human-readable binary representation, like "01:23:45:67:89:AB:CD:EF".
 static String createReadableStringFromBinary(const unsigned char* value, size_t length)
 {
@@ -69,6 +70,7 @@ static String createReadableStringFromBinary(const unsigned char* value, size_t
     ASSERT(index == bufferSize);
     return String::adopt(buffer);
 }
+#endif
 
 InspectorResource::InspectorResource(unsigned long identifier, DocumentLoader* loader, const KURL& requestURL)
     : m_identifier(identifier)

-- 
WebKit Debian packaging