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

[yurys at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit f340aa12e196f4bb19646aa001a0a0759ad37532
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jan 31 07:38:52 2010 +0000

    2010-01-31  Yury Semikhatsky  <yurys at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Make ScriptState destructor protected since all non-empty
            ScriptStates are managed by GC. Remove obsolete constructor.
    
            https://bugs.webkit.org/show_bug.cgi?id=34266
    
            * bindings/v8/ScriptState.cpp:
            * bindings/v8/ScriptState.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54108 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 00031c3..3e8cb20 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-31  Yury Semikhatsky  <yurys at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Make ScriptState destructor protected since all non-empty
+        ScriptStates are managed by GC. Remove obsolete constructor.
+
+        https://bugs.webkit.org/show_bug.cgi?id=34266
+
+        * bindings/v8/ScriptState.cpp:
+        * bindings/v8/ScriptState.h:
+
 2010-01-30  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebCore/bindings/v8/ScriptState.cpp b/WebCore/bindings/v8/ScriptState.cpp
index 12ed1cb..fac1d26 100644
--- a/WebCore/bindings/v8/ScriptState.cpp
+++ b/WebCore/bindings/v8/ScriptState.cpp
@@ -42,11 +42,6 @@
 
 namespace WebCore {
 
-ScriptState::ScriptState(Frame*, v8::Handle<v8::Context> context)
-    : m_context(v8::Persistent<v8::Context>::New(context))
-{
-}
-
 ScriptState::ScriptState(v8::Handle<v8::Context> context)
     : m_context(v8::Persistent<v8::Context>::New(context))
 {
diff --git a/WebCore/bindings/v8/ScriptState.h b/WebCore/bindings/v8/ScriptState.h
index bbb62db..e71becb 100644
--- a/WebCore/bindings/v8/ScriptState.h
+++ b/WebCore/bindings/v8/ScriptState.h
@@ -44,11 +44,6 @@ namespace WebCore {
 
     class ScriptState : public Noncopyable {
     public:
-        // FIXME: This destructor will become private shortly.
-        ~ScriptState();
-        // FIXME: This constructor will go away shortly.
-        ScriptState(Frame*, v8::Handle<v8::Context>);
-
         bool hadException() { return !m_exception.IsEmpty(); }
         void setException(v8::Local<v8::Value> exception)
         {
@@ -66,6 +61,7 @@ namespace WebCore {
 
     protected:
         ScriptState() { }
+        ~ScriptState();
 
     private:
         friend ScriptState* mainWorldScriptState(Frame*);

-- 
WebKit Debian packaging