Changeset 52938 in webkit

Timestamp:

Jan 7, 2010 12:08:19 PM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-01-07 Adam Barth <​abarth@webkit.org>

Unreviewed. Resolve merge conflict.

• bindings/v8/V8Proxy.cpp: (WebCore::V8Proxy::setContextDebugId):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/V8Proxy.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-07  Adam Barth  <abarth@webkit.org>
+
+        Unreviewed.  Resolve merge conflict.
+
+        * bindings/v8/V8Proxy.cpp:
+        (WebCore::V8Proxy::setContextDebugId):
+
 2010-01-07  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/bindings/v8/V8Proxy.cpp

@@ -831 +831 @@
 {
     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@webkit.org>
     if (context.IsEmpty())
         return false;