[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit af34fe772ecf78bbdaa5c3459a5af8b1e7e475c8
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 28 14:45:12 2009 +0000

    Prospective build fix for r48812.
    
    Patch by Simon Hausmann <simon.hausmann at nokia.com> on 2009-09-28
    Forgot to remove the inline reset() implementation when reverting the indentation
    changes in the file.
    
    * xml/XSLTProcessor.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48814 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c2ac3f3..2e26d83 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-09-28  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Prospective build fix for r48812.
+
+        Forgot to remove the inline reset() implementation when reverting the indentation
+        changes in the file.
+
+        * xml/XSLTProcessor.h:
+
 2009-09-28  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by nobody (trivial follow up fix), Joseph Pecoraro LGTM-ed.
diff --git a/WebCore/xml/XSLTProcessor.h b/WebCore/xml/XSLTProcessor.h
index 9ee2aad..4b90c16 100644
--- a/WebCore/xml/XSLTProcessor.h
+++ b/WebCore/xml/XSLTProcessor.h
@@ -56,7 +56,7 @@ public:
     void removeParameter(const String& namespaceURI, const String& localName);
     void clearParameters() { m_parameters.clear(); }
 
-    void reset() { m_stylesheet.clear(); m_stylesheetRootNode.clear();  m_parameters.clear(); }
+    void reset();
 
     static void parseErrorFunc(void* userData, xmlError*);
     static void genericErrorFunc(void* userData, const char* msg, ...);

-- 
WebKit Debian packaging