[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[dimich at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 60306321ebdc2269044889b7d38df0a0724be343
Author: dimich at chromium.org <dimich at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 20 21:56:08 2010 +0000

    Move local utility class DocumentWeakReference entirely from Document.h into Document.cpp
    since it is only used there. It is a followup for http://trac.webkit.org/changeset/53345.
    
    Reviewed by Darin Adler.
    
    No new tests since no change in functionality.
    
    * dom/Document.cpp: Move definitions of the methods into declaration of the class, remove 'inline'.
    * dom/Document.h: Replace DocumentWeakReference declaration with a forward declaration.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53563 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d3f23f2..b9574cf 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-20  Dmitry Titov  <dimich at chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Move local utility class DocumentWeakReference entirely from Document.h into Document.cpp
+        since it is only used there. It is a followup for http://trac.webkit.org/changeset/53345.
+
+        No new tests since no change in functionality.
+
+        * dom/Document.cpp: Move definitions of the methods into declaration of the class, remove 'inline'.
+        * dom/Document.h: Replace DocumentWeakReference declaration with a forward declaration.
+
 2010-01-20  Oliver Hunt  <oliver at apple.com>
 
         No review, rolling out r53561.
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index 31c6bae..70e9ae9 100644
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -322,6 +322,35 @@ static bool disableRangeMutation(Page* page)
 
 static HashSet<Document*>* documentsThatNeedStyleRecalc = 0;
 
+class DocumentWeakReference : public ThreadSafeShared<DocumentWeakReference> {
+public:
+    static PassRefPtr<DocumentWeakReference> create(Document* document)
+    {
+        return adoptRef(new DocumentWeakReference(document));
+    }
+
+    Document* document()
+    {
+        ASSERT(isMainThread());
+        return m_document;
+    }
+
+    void clear()
+    {
+        ASSERT(isMainThread());
+        m_document = 0;
+    }
+
+private:
+    DocumentWeakReference(Document* document)
+        : m_document(document)
+    {
+        ASSERT(isMainThread());
+    }
+
+    Document* m_document;
+};
+
 Document::Document(Frame* frame, bool isXHTML, bool isHTML)
     : ContainerNode(0)
     , m_domtree_version(0)
@@ -4798,22 +4827,4 @@ InspectorTimelineAgent* Document::inspectorTimelineAgent() const
 }
 #endif
 
-inline DocumentWeakReference::DocumentWeakReference(Document* document)
-    : m_document(document)
-{
-    ASSERT(isMainThread());
-}
-
-inline Document* DocumentWeakReference::document()
-{
-    ASSERT(isMainThread());
-    return m_document;
-}
-
-inline void DocumentWeakReference::clear()
-{
-    ASSERT(isMainThread());
-    m_document = 0;
-}
-
 } // namespace WebCore
diff --git a/WebCore/dom/Document.h b/WebCore/dom/Document.h
index 31cbaa5..6d7e088 100644
--- a/WebCore/dom/Document.h
+++ b/WebCore/dom/Document.h
@@ -64,6 +64,7 @@ namespace WebCore {
     class DocLoader;
     class DocumentFragment;
     class DocumentType;
+    class DocumentWeakReference;
     class EditingText;
     class Element;
     class EntityReference;
@@ -174,19 +175,6 @@ struct FormElementKeyHashTraits : WTF::GenericHashTraits<FormElementKey> {
     static bool isDeletedValue(const FormElementKey& value) { return value.isHashTableDeletedValue(); }
 };
 
-class DocumentWeakReference : public ThreadSafeShared<DocumentWeakReference> {
-public:
-    static PassRefPtr<DocumentWeakReference> create(Document* document)
-    {
-        return adoptRef(new DocumentWeakReference(document));
-    }
-    Document* document();
-    void clear();
-private:
-    DocumentWeakReference(Document*);
-    Document* m_document;
-};
-
 class Document : public ContainerNode, public ScriptExecutionContext {
 public:
     static PassRefPtr<Document> create(Frame* frame)

-- 
WebKit Debian packaging