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

[tonyg at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit efeb7ff12992a204acec14355ec01857b39c139b
Author: tonyg at chromium.org <tonyg at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 12 05:50:10 2010 +0000

    2010-08-11  Tony Gentilcore  <tonyg at chromium.org>
    
            Reviewed by Adam Barth.
    
            Make PendingScript copyable so that it can be stored in containers
            https://bugs.webkit.org/show_bug.cgi?id=43875
    
            This will be useful for storing PendingScripts in a Vector or Deque for
            async and defer scripts.
    
            No new tests because no functional changes.
    
            * dom/PendingScript.h:
            (WebCore::PendingScript::PendingScript):
            (WebCore::PendingScript::operator=):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65217 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fa8f28b..a042f75 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-08-11  Tony Gentilcore  <tonyg at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Make PendingScript copyable so that it can be stored in containers
+        https://bugs.webkit.org/show_bug.cgi?id=43875
+
+        This will be useful for storing PendingScripts in a Vector or Deque for
+        async and defer scripts.
+
+        No new tests because no functional changes.
+
+        * dom/PendingScript.h:
+        (WebCore::PendingScript::PendingScript):
+        (WebCore::PendingScript::operator=):
+
 2010-08-11  Victoria Kirst  <vrk at google.com>
 
         Reviewed by David Levin.
diff --git a/WebCore/dom/PendingScript.h b/WebCore/dom/PendingScript.h
index 805f7ff..44e1e49 100644
--- a/WebCore/dom/PendingScript.h
+++ b/WebCore/dom/PendingScript.h
@@ -28,7 +28,6 @@
 
 #include "CachedResourceClient.h"
 #include "CachedResourceHandle.h"
-#include <wtf/Noncopyable.h>
 #include <wtf/PassRefPtr.h>
 
 namespace WebCore {
@@ -41,7 +40,7 @@ class Element;
 // A CachedResourceHandle alone does not prevent the underlying CachedResource
 // from purging its data buffer. This class holds a dummy client open for its
 // lifetime in order to guarantee that the data buffer will not be purged.
-class PendingScript : public Noncopyable, CachedResourceClient {
+class PendingScript : public CachedResourceClient {
 public:
     PendingScript()
         : m_startingLineNumber(0)
@@ -49,8 +48,30 @@ public:
     {
     }
 
+    PendingScript(const PendingScript& other)
+        : CachedResourceClient(other)
+        , m_startingLineNumber(other.m_startingLineNumber)
+        , m_watchingForLoad(other.m_watchingForLoad)
+        , m_element(other.m_element)
+    {
+        setCachedScript(other.cachedScript());
+    }
+
     ~PendingScript();
 
+    PendingScript& operator=(const PendingScript& other)
+    {
+        if (this == &other)
+            return *this;
+
+        m_startingLineNumber = other.m_startingLineNumber;
+        m_watchingForLoad = other.m_watchingForLoad;
+        m_element = other.m_element;
+        setCachedScript(other.cachedScript());
+
+        return *this;
+    }
+
     // FIXME: No setter means this is never set to anything other than 0.
     // This is either unnecessary or incorrect.
     int startingLineNumber() const { return m_startingLineNumber; }

-- 
WebKit Debian packaging