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

[apavlov at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit ff7505c0beae446384299a070798b94855f49ea5
Author: apavlov at chromium.org <apavlov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 7 11:09:13 2010 +0000

    2010-10-07  Alexander Pavlov  <apavlov at chromium.org>
    
            Unreviewed, release build fix.
    
            * inspector/InspectorStyleSheet.cpp:
            (WebCore::InspectorStyleSheetForInlineStyle::setStyleText):
            * inspector/InspectorStyleSheet.h:
            (WebCore::InspectorStyleSheetForInlineStyle::styleForId):
            (WebCore::InspectorStyleSheetForInlineStyle::ruleSourceDataFor):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69287 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 40bdd21..57674be 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-07  Alexander Pavlov  <apavlov at chromium.org>
+
+        Unreviewed, release build fix.
+
+        * inspector/InspectorStyleSheet.cpp:
+        (WebCore::InspectorStyleSheetForInlineStyle::setStyleText):
+        * inspector/InspectorStyleSheet.h:
+        (WebCore::InspectorStyleSheetForInlineStyle::styleForId):
+        (WebCore::InspectorStyleSheetForInlineStyle::ruleSourceDataFor):
+
 2010-10-07  Pavel Podivilov  <podivilov at chromium.org>
 
         Unreviewed, build fix.
diff --git a/WebCore/inspector/InspectorStyleSheet.cpp b/WebCore/inspector/InspectorStyleSheet.cpp
index 77c7694..eb25fc4 100644
--- a/WebCore/inspector/InspectorStyleSheet.cpp
+++ b/WebCore/inspector/InspectorStyleSheet.cpp
@@ -514,6 +514,7 @@ InspectorStyleSheetForInlineStyle::InspectorStyleSheetForInlineStyle(const Strin
 bool InspectorStyleSheetForInlineStyle::setStyleText(const String& styleId, const String& text)
 {
     ASSERT(styleId == "0");
+    UNUSED_PARAM(styleId);
     ExceptionCode ec = 0;
     m_element->setAttribute("style", text, ec);
     m_ruleSourceData.clear();
diff --git a/WebCore/inspector/InspectorStyleSheet.h b/WebCore/inspector/InspectorStyleSheet.h
index f070e2a..38ab777 100644
--- a/WebCore/inspector/InspectorStyleSheet.h
+++ b/WebCore/inspector/InspectorStyleSheet.h
@@ -35,6 +35,7 @@
 #include <wtf/OwnPtr.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
+#include <wtf/UnusedParam.h>
 
 class ParsedStyleSheet;
 
@@ -110,12 +111,12 @@ public:
     }
 
     InspectorStyleSheetForInlineStyle(const String& id, Element* element, const String& origin);
-    virtual CSSStyleDeclaration* styleForId(const String& id) const { ASSERT(id == "0"); return inlineStyle(); }
+    virtual CSSStyleDeclaration* styleForId(const String& id) const { ASSERT(id == "0"); UNUSED_PARAM(id); return inlineStyle(); }
     virtual bool setStyleText(const String& styleId, const String& text);
 
 protected:
     virtual Document* ownerDocument() const;
-    virtual RefPtr<CSSRuleSourceData> ruleSourceDataFor(CSSStyleDeclaration* style) const { ASSERT(style == inlineStyle()); return m_ruleSourceData; }
+    virtual RefPtr<CSSRuleSourceData> ruleSourceDataFor(CSSStyleDeclaration* style) const { ASSERT(style == inlineStyle()); UNUSED_PARAM(style); return m_ruleSourceData; }
     virtual unsigned ruleIndexByStyle(CSSStyleDeclaration*) const { return 0; }
     virtual bool ensureParsedDataReady();
 

-- 
WebKit Debian packaging