Merge webkit.org at r60469 : Fix conflicts.

The changes to DomWindow.cpp are needed by @60104 moving things from the frame to the FrameView
http://trac.webkit.org/changeset/60104

Change-Id: I8a7aa0478c2f0239bc52bb5078c446e5c8c84972

2 files changed, 0 insertions, 13 deletions

diff --git a/WebCore/bindings/v8/ScriptCallStack.cpp b/WebCore/bindings/v8/ScriptCallStack.cpp
index e55f8b5..c0b1780 100644
--- a/WebCore/bindings/v8/ScriptCallStack.cpp
+++ b/WebCore/bindings/v8/ScriptCallStack.cpp
@@ -52,17 +52,13 @@ ScriptCallStack* ScriptCallStack::create(const v8::Arguments& arguments, unsigne
 
 bool ScriptCallStack::callLocation(String* sourceName, int* sourceLineNumber, String* functionName)
 {
-<<<<<<< HEAD
 #if PLATFORM(ANDROID)
     return false;
 #else
-    if (!topStackFrame(*sourceName, *sourceLineNumber, *functionName))
-=======
     v8::HandleScope scope;
     v8::Context::Scope contextScope(v8::Context::GetCurrent());
     v8::Handle<v8::StackTrace> stackTrace(v8::StackTrace::CurrentStackTrace(1));
     if (stackTrace.IsEmpty())
->>>>>>> webkit.org at r60469
         return false;
     if (stackTrace->GetFrameCount() <= 0) {
         // Successfully grabbed stack trace, but there are no frames.
diff --git a/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp b/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp
index badf332..4867cfe 100644
--- a/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp
@@ -697,21 +697,12 @@ v8::Handle<v8::Value> V8DOMWindow::openCallback(const v8::Arguments& args)
         windowFeatures.ySet = false;
     }
     if (!rawFeatures.widthSet) {
-<<<<<<< HEAD
-        windowFeatures.width = 0;
-        windowFeatures.widthSet = false;
-    }
-    if (!rawFeatures.heightSet) {
-        windowFeatures.height = 0;
-        windowFeatures.heightSet = false;
-=======
       windowFeatures.width = 0;
       windowFeatures.widthSet = false;
     }
     if (!rawFeatures.heightSet) {
       windowFeatures.height = 0;
       windowFeatures.heightSet = false;
->>>>>>> webkit.org at r60469
     }
 
     frame = V8BindingDOMWindow::createWindow(V8BindingState::Only(), callingFrame, enteredFrame, frame, urlString, frameName, windowFeatures, v8::Local<v8::Value>());