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

[caseq at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit f33914979fab2215d687127637455f0b5aaf36dc
Author: caseq at chromium.org <caseq at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 7 12:03:38 2010 +0000

    2010-10-07  Andrey Kosyakov  <caseq at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            Chromium multi-dll build broken due to WebResourceRawHeaders methods lacking WEBKIT_API decl spec
            https://bugs.webkit.org/show_bug.cgi?id=47329
    
            * public/WebResourceRawHeaders.h:
            (WebKit::WebResourceRawHeaders::WebResourceRawHeaders):
            (WebKit::WebResourceRawHeaders::~WebResourceRawHeaders):
            (WebKit::WebResourceRawHeaders::operator =):
            * src/WebResourceRawHeaders.cpp:
            (WebKit::WebResourceRawHeaders::initialize):
            (WebKit::WebResourceRawHeaders::reset):
            (WebKit::WebResourceRawHeaders::assign):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69295 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 701a8fe..7005238 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,19 @@
+2010-10-07  Andrey Kosyakov  <caseq at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Chromium multi-dll build broken due to WebResourceRawHeaders methods lacking WEBKIT_API decl spec
+        https://bugs.webkit.org/show_bug.cgi?id=47329
+
+        * public/WebResourceRawHeaders.h:
+        (WebKit::WebResourceRawHeaders::WebResourceRawHeaders):
+        (WebKit::WebResourceRawHeaders::~WebResourceRawHeaders):
+        (WebKit::WebResourceRawHeaders::operator =):
+        * src/WebResourceRawHeaders.cpp:
+        (WebKit::WebResourceRawHeaders::initialize):
+        (WebKit::WebResourceRawHeaders::reset):
+        (WebKit::WebResourceRawHeaders::assign):
+
 2010-10-06  Chris Guillory  <chris.guillory at google.com>
 
         Reviewed by Chris Fleizach.
diff --git a/WebKit/chromium/public/WebResourceRawHeaders.h b/WebKit/chromium/public/WebResourceRawHeaders.h
index 90cc815..b91e68b 100644
--- a/WebKit/chromium/public/WebResourceRawHeaders.h
+++ b/WebKit/chromium/public/WebResourceRawHeaders.h
@@ -45,11 +45,20 @@ class WebString;
 
 class WebResourceRawHeaders {
 public:
-    WebResourceRawHeaders();
-    ~WebResourceRawHeaders();
+    WebResourceRawHeaders() { initialize(); }
+    ~WebResourceRawHeaders() { reset(); }
+    WebResourceRawHeaders(const WebResourceRawHeaders& r) { assign(r); }
+    WebResourceRawHeaders& operator =(const WebResourceRawHeaders& r)
+    { 
+        assign(r);
+        return *this;
+    }
 
-    void addRequestHeader(const WebString& name, const WebString& value);
-    void addResponseHeader(const WebString& name, const WebString& value);
+    WEBKIT_API void initialize();
+    WEBKIT_API void reset();
+    WEBKIT_API void assign(const WebResourceRawHeaders& r);
+    WEBKIT_API void addRequestHeader(const WebString& name, const WebString& value);
+    WEBKIT_API void addResponseHeader(const WebString& name, const WebString& value);
 
 #if WEBKIT_IMPLEMENTATION
     WebResourceRawHeaders(WTF::PassRefPtr<WebCore::ResourceRawHeaders>);
diff --git a/WebKit/chromium/src/WebResourceRawHeaders.cpp b/WebKit/chromium/src/WebResourceRawHeaders.cpp
index 3a5ee95..b597ce2 100644
--- a/WebKit/chromium/src/WebResourceRawHeaders.cpp
+++ b/WebKit/chromium/src/WebResourceRawHeaders.cpp
@@ -40,16 +40,21 @@ using namespace WebCore;
 
 namespace WebKit {
 
-WebResourceRawHeaders::WebResourceRawHeaders()
+void WebResourceRawHeaders::initialize()
 {
     m_private = adoptRef(new ResourceRawHeaders());
 }
 
-WebResourceRawHeaders::~WebResourceRawHeaders()
+void WebResourceRawHeaders::reset()
 {
     m_private.reset();
 }
 
+void WebResourceRawHeaders::assign(const WebResourceRawHeaders& r)
+{
+    m_private = r.m_private;
+}
+
 WebResourceRawHeaders::WebResourceRawHeaders(WTF::PassRefPtr<WebCore::ResourceRawHeaders> value)
 {
     m_private = value;

-- 
WebKit Debian packaging