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

darin at chromium.org darin at chromium.org
Wed Dec 22 17:55:53 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit a48c10d1a22dfb07e783dccb15655f504f15f07d
Author: darin at chromium.org <darin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 2 21:18:57 2010 +0000

    2010-12-02  Darin Fisher  <darin at chromium.org>
    
            Fix the Windows multi-dll build.  Do not export functions that are
            implemented inline!
    
            * public/WebFormControlElement.h:
            (WebKit::WebFormControlElement::assign):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73190 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 3053d64..09914f6 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,11 @@
+2010-12-02  Darin Fisher  <darin at chromium.org>
+
+        Fix the Windows multi-dll build.  Do not export functions that are
+        implemented inline!
+
+        * public/WebFormControlElement.h:
+        (WebKit::WebFormControlElement::assign):
+
 2010-12-02  Tony Chang  <tony at chromium.org>
 
         Unreviewed, roll chromium deps to r67980.
diff --git a/WebKit/chromium/public/WebFormControlElement.h b/WebKit/chromium/public/WebFormControlElement.h
index ee0783d..56a02dd 100644
--- a/WebKit/chromium/public/WebFormControlElement.h
+++ b/WebKit/chromium/public/WebFormControlElement.h
@@ -51,7 +51,7 @@ public:
         WebElement::assign(e);
         return *this;
     }
-    WEBKIT_API void assign(const WebFormControlElement& e) { WebElement::assign(e); }
+    void assign(const WebFormControlElement& e) { WebElement::assign(e); }
 
     WEBKIT_API bool isEnabled() const;
     WEBKIT_API WebString formControlName() const;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list