[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87

[abarth at webkit.org]

The following commit has been merged in the debian/unstable branch:
commit 4773dbdf8add7997c659a69866a736eaa13383d8
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 7 20:08:19 2010 +0000

    2010-01-07  Adam Barth  <abarth at webkit.org>
    
            Unreviewed.  Resolve merge conflict.
    
            * bindings/v8/V8Proxy.cpp:
            (WebCore::V8Proxy::setContextDebugId):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52938 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5be25e5..59e3463 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,12 @@
 2010-01-07  Adam Barth  <abarth at webkit.org>
 
+        Unreviewed.  Resolve merge conflict.
+
+        * bindings/v8/V8Proxy.cpp:
+        (WebCore::V8Proxy::setContextDebugId):
+
+2010-01-07  Adam Barth  <abarth at webkit.org>
+
         No review, rolling out r52847.
         http://trac.webkit.org/changeset/52847
         https://bugs.webkit.org/show_bug.cgi?id=33232
diff --git a/WebCore/bindings/v8/V8Proxy.cpp b/WebCore/bindings/v8/V8Proxy.cpp
index afd2231..fdb2e49 100644
--- a/WebCore/bindings/v8/V8Proxy.cpp
+++ b/WebCore/bindings/v8/V8Proxy.cpp
@@ -830,12 +830,8 @@ void V8Proxy::registerExtension(v8::Extension* extension, int extensionGroup)
 bool V8Proxy::setContextDebugId(int debugId)
 {
     ASSERT(debugId > 0);
-<<<<<<< HEAD
     v8::HandleScope scope;
-    v8::Local<v8::Context> context = m_frame->script()->mainWorldWindowShell()->localHandleForContext();
-=======
     v8::Handle<v8::Context> context = windowShell()->context();
->>>>>>> 99d3c27... 2010-01-05  Adam Barth  <abarth at webkit.org>
     if (context.IsEmpty())
         return false;
     if (!context->GetData()->IsUndefined())

-- 
WebKit Debian packaging