[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit a8601f4f64f32e736ffd93b310d42ee96ae612d1
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 5 17:33:44 2011 +0000

    2011-01-05  Sheriff Bot  <webkit.review.bot at gmail.com>
    
            Unreviewed, rolling out r74778.
            http://trac.webkit.org/changeset/74778
            https://bugs.webkit.org/show_bug.cgi?id=51930
    
            Android and QtWebKit-V8 uses V8DOMWindowShell::setContext.
            (Requested by bbandix on #webkit).
    
            * bindings/v8/V8DOMWindowShell.cpp:
            (WebCore::V8DOMWindowShell::setContext):
            * bindings/v8/V8DOMWindowShell.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75073 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 71317c7..34821b4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-05  Sheriff Bot  <webkit.review.bot at gmail.com>
+
+        Unreviewed, rolling out r74778.
+        http://trac.webkit.org/changeset/74778
+        https://bugs.webkit.org/show_bug.cgi?id=51930
+
+        Android and QtWebKit-V8 uses V8DOMWindowShell::setContext.
+        (Requested by bbandix on #webkit).
+
+        * bindings/v8/V8DOMWindowShell.cpp:
+        (WebCore::V8DOMWindowShell::setContext):
+        * bindings/v8/V8DOMWindowShell.h:
+
 2011-01-05  Yi Shen  <yi.4.shen at nokia.com>
 
         Reviewed by Andreas Kling.
diff --git a/WebCore/bindings/v8/V8DOMWindowShell.cpp b/WebCore/bindings/v8/V8DOMWindowShell.cpp
index 5bddbf3..8205fe5 100644
--- a/WebCore/bindings/v8/V8DOMWindowShell.cpp
+++ b/WebCore/bindings/v8/V8DOMWindowShell.cpp
@@ -349,6 +349,16 @@ v8::Persistent<v8::Context> V8DOMWindowShell::createNewContext(v8::Handle<v8::Ob
     return result;
 }
 
+void V8DOMWindowShell::setContext(v8::Handle<v8::Context> context)
+{
+    // if we already have a context, clear it before setting the new one.
+    if (!m_context.IsEmpty()) {
+        m_context.Dispose();
+        m_context.Clear();
+    }
+    m_context = v8::Persistent<v8::Context>::New(context);
+}
+
 bool V8DOMWindowShell::installDOMWindow(v8::Handle<v8::Context> context, DOMWindow* window)
 {
     // Create a new JS window object and use it as the prototype for the  shadow global object.
diff --git a/WebCore/bindings/v8/V8DOMWindowShell.h b/WebCore/bindings/v8/V8DOMWindowShell.h
index 84d14b9..76c27af 100644
--- a/WebCore/bindings/v8/V8DOMWindowShell.h
+++ b/WebCore/bindings/v8/V8DOMWindowShell.h
@@ -66,7 +66,8 @@ public:
     bool isContextInitialized();
 
     v8::Persistent<v8::Context> createNewContext(v8::Handle<v8::Object> global, int extensionGroup);
-    static bool installDOMWindow(v8::Handle<v8::Context>, DOMWindow*);
+    void setContext(v8::Handle<v8::Context>);
+    static bool installDOMWindow(v8::Handle<v8::Context> context, DOMWindow*);
 
     bool initContextIfNeeded();
     void updateDocumentWrapper(v8::Handle<v8::Object> wrapper);

-- 
WebKit Debian packaging