Merge changes I2e7e2317,Ie6ccde3a,I3e89f231,Id06ff339,I268dfe7d,Icaf70d9f,Ie234f1a0,Iff5c7aaa,I69b75bf0,Ifbf384f4

* changes:
  Merge WebKit at r65615 : Update WebKit revision number
  Merge WebKit at r65615 : Ignore http/tests/appcache/origin-quota.html
  Merge WebKit at r65615 : Android-specific results for Geolocation tests.
  Merge WebKit at r65615 : Fix GraphicsContext and ImageBuffer.
  Merge WebKit at r65615 : processingUserGesture() is now static.
  Merge WebKit at r65615 : UTF8String() becomes utf8().
  Merge WebKit at r65615 : Fix include paths for string headers.
  Merge WebKit at r65615 : Fix Makefiles.
  Merge WebKit at r65615 : Fix conflicts.
  Merge WebKit at r65615 : Initial merge by git.

1 files changed, 23 insertions, 2 deletions

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; }