[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[ggaren at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 78c1c6429396811c2a68b99f09422c3e4d387f4c
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 24 07:15:08 2009 +0000

    Windows build fix: Declare set/unsetPendingActivity public, so
    SharedWorkerScriptLoader can call them.
    
    Patch by Geoffrey Garen <ggaren at apple.com> on 2009-09-24
    * dom/ActiveDOMObject.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48706 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9fc63a9..0a61d46 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,12 @@
 2009-09-24  Geoffrey Garen  <ggaren at apple.com>
 
+        Windows build fix: Declare set/unsetPendingActivity public, so
+        SharedWorkerScriptLoader can call them.
+
+        * dom/ActiveDOMObject.h:
+
+2009-09-24  Geoffrey Garen  <ggaren at apple.com>
+
         Fixed a bit of the Windows build.
 
         * workers/SharedWorker.idl: Declare a custom mark function. (I accidentally
diff --git a/WebCore/dom/ActiveDOMObject.h b/WebCore/dom/ActiveDOMObject.h
index e58d3f9..73b52d5 100644
--- a/WebCore/dom/ActiveDOMObject.h
+++ b/WebCore/dom/ActiveDOMObject.h
@@ -53,9 +53,6 @@ namespace WebCore {
         virtual void resume();
         virtual void stop();
 
-    protected:
-        virtual ~ActiveDOMObject();
-
         template<class T> void setPendingActivity(T* thisObject)
         {
             ASSERT(thisObject == this);
@@ -70,6 +67,9 @@ namespace WebCore {
             thisObject->deref();
         }
 
+    protected:
+        virtual ~ActiveDOMObject();
+
     private:
         ScriptExecutionContext* m_scriptExecutionContext;
         unsigned m_pendingActivityCount;

-- 
WebKit Debian packaging