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

7 files changed, 10 insertions, 101 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>());
diff --git a/WebCore/html/HTMLLinkElement.h b/WebCore/html/HTMLLinkElement.h
index ae88c44..bf40ca5 100644
--- a/WebCore/html/HTMLLinkElement.h
+++ b/WebCore/html/HTMLLinkElement.h
@@ -111,12 +111,8 @@ private:
 
     // from CachedResourceClient
     virtual void setCSSStyleSheet(const String& href, const KURL& baseURL, const String& charset, const CachedCSSStyleSheet* sheet);
-<<<<<<< HEAD
     virtual void notifyFinished(CachedResource*);
 
-    bool isLoading() const;
-=======
->>>>>>> webkit.org at r60469
     virtual bool sheetLoaded();
 
     bool isAlternate() const { return m_disabledState == Unset && m_relAttribute.m_isAlternate; }
@@ -133,7 +129,6 @@ private:
 
     virtual void finishParsingChildren();
 
-<<<<<<< HEAD
 #ifdef ANDROID_INSTRUMENT
     // Overridden to resolve the ambiguous
     void* operator new(size_t size);
@@ -142,12 +137,9 @@ private:
     void operator delete[](void* p, size_t size);
 #endif
 
-protected:
-    void timerFired(Timer<HTMLLinkElement>*);
-=======
 private:
+    void timerFired(Timer<HTMLLinkElement>*);
     HTMLLinkElement(const QualifiedName&, Document*, bool createdByParser);
->>>>>>> webkit.org at r60469
 
     enum DisabledState {
         Unset,
diff --git a/WebCore/html/HTMLTableCellElement.cpp b/WebCore/html/HTMLTableCellElement.cpp
index 92ccdf1..e4871f0 100644
--- a/WebCore/html/HTMLTableCellElement.cpp
+++ b/WebCore/html/HTMLTableCellElement.cpp
@@ -99,13 +99,10 @@ void HTMLTableCellElement::parseMappedAttribute(Attribute* attr)
         if (renderer() && renderer()->isTableCell())
             toRenderTableCell(renderer())->updateFromElement();
     } else if (attr->name() == nowrapAttr) {
-<<<<<<< HEAD
 #ifdef ANDROID_LAYOUT
         if (!(document()->frame()) || document()->frame()->settings()->layoutAlgorithm() != Settings::kLayoutSSR)
 #endif
-=======
         // FIXME: What about removing the property when the attribute becomes null?
->>>>>>> webkit.org at r60469
         if (!attr->isNull())
             addCSSProperty(attr, CSSPropertyWhiteSpace, CSSValueWebkitNowrap);
     } else if (attr->name() == widthAttr) {
diff --git a/WebCore/page/DOMWindow.cpp b/WebCore/page/DOMWindow.cpp
index 7f3151d..9532ec9 100644
--- a/WebCore/page/DOMWindow.cpp
+++ b/WebCore/page/DOMWindow.cpp
@@ -954,15 +954,11 @@ int DOMWindow::innerHeight() const
     if (!view)
         return 0;
     
-<<<<<<< HEAD
 #if PLATFORM(ANDROID)
-    return static_cast<int>(view->actualHeight() / m_frame->pageZoomFactor());
+    return static_cast<int>(view->actualHeight() / view->pageZoomFactor());
 #else
-    return static_cast<int>(view->height() / m_frame->pageZoomFactor());
-#endif
-=======
     return static_cast<int>(view->height() / view->pageZoomFactor());
->>>>>>> webkit.org at r60469
+#endif
 }
 
 int DOMWindow::innerWidth() const
@@ -974,15 +970,11 @@ int DOMWindow::innerWidth() const
     if (!view)
         return 0;
 
-<<<<<<< HEAD
 #if PLATFORM(ANDROID)
-    return static_cast<int>(view->actualWidth() / m_frame->pageZoomFactor());
+    return static_cast<int>(view->actualWidth() / view->pageZoomFactor());
 #else
-    return static_cast<int>(view->width() / m_frame->pageZoomFactor());
-#endif
-=======
     return static_cast<int>(view->width() / view->pageZoomFactor());
->>>>>>> webkit.org at r60469
+#endif
 }
 
 int DOMWindow::screenX() const
@@ -1020,15 +1012,11 @@ int DOMWindow::scrollX() const
 
     m_frame->document()->updateLayoutIgnorePendingStylesheets();
 
-<<<<<<< HEAD
 #if PLATFORM(ANDROID)
-    return static_cast<int>(view->actualScrollX() / m_frame->pageZoomFactor());
+    return static_cast<int>(view->actualScrollX() / view->pageZoomFactor());
 #else
-    return static_cast<int>(view->scrollX() / m_frame->pageZoomFactor());
-#endif
-=======
     return static_cast<int>(view->scrollX() / view->pageZoomFactor());
->>>>>>> webkit.org at r60469
+#endif
 }
 
 int DOMWindow::scrollY() const
@@ -1042,15 +1030,11 @@ int DOMWindow::scrollY() const
 
     m_frame->document()->updateLayoutIgnorePendingStylesheets();
 
-<<<<<<< HEAD
 #if PLATFORM(ANDROID)
-    return static_cast<int>(view->actualScrollY() / m_frame->pageZoomFactor());
+    return static_cast<int>(view->actualScrollY() / view->pageZoomFactor());
 #else
-    return static_cast<int>(view->scrollY() / m_frame->pageZoomFactor());
-#endif
-=======
     return static_cast<int>(view->scrollY() / view->pageZoomFactor());
->>>>>>> webkit.org at r60469
+#endif
 }
 
 bool DOMWindow::closed() const
diff --git a/WebCore/platform/android/TemporaryLinkStubs.cpp b/WebCore/platform/android/TemporaryLinkStubs.cpp
index 3cb65b7..302a1ed 100644
--- a/WebCore/platform/android/TemporaryLinkStubs.cpp
+++ b/WebCore/platform/android/TemporaryLinkStubs.cpp
@@ -65,11 +65,7 @@
 #include "PageCache.h"
 #include "Pasteboard.h"
 #include "Path.h"
-<<<<<<< HEAD
-#include "PluginInfoStore.h"
 #include "PluginWidget.h"
-=======
->>>>>>> webkit.org at r60469
 #include "ResourceError.h"
 #include "ResourceHandle.h"
 #include "ResourceLoader.h"
@@ -107,53 +103,10 @@ String WebCore::defaultLanguage()
 
 namespace WebCore {
 
-<<<<<<< HEAD
-#if !defined(ANDROID_PLUGINS)
-// If plugins support is turned on, don't use these stubs.
-
-// Except for supportsMIMEType(), these Plugin functions are used by javascript's
-// navigator.plugins[] object to provide the list of available plugins. This is most
-// often used with to check to see if the browser supports Flash or which video
-// codec to use.
-// The supportsMIMEType() is used by the Frame to determine if a full screen instance
-// of a plugin can be used to render a mimetype that is not native to the browser.
-PluginInfo* PluginInfoStore::createPluginInfoForPluginAtIndex(unsigned)
-{
-    ASSERT_NOT_REACHED();
-    return 0;
-}
-
-unsigned PluginInfoStore::pluginCount() const
-{
-    verifiedOk();
-    return 0;
-}
-
-String PluginInfoStore::pluginNameForMIMEType(const String&)
-{
-    notImplemented();
-    return String();
-}
-
-bool PluginInfoStore::supportsMIMEType(const String&)
-{
-    verifiedOk();
-    return false;
-}
-
-void refreshPlugins(bool)
-{
-    verifiedOk();
-}
-
-#endif // !defined(ANDROID_PLUGINS)
-
 // Needed to link with PluginWidget as a parent class of PluginToggleWidget. Mac
 // defines this in plugins/mac/PluginWidgetMac.mm
-void PluginWidget::invalidateRect(const IntRect&) {}
+void PluginWidget::invalidateRect(const IntRect&) { }
 
-=======
->>>>>>> webkit.org at r60469
 // This function tells the bridge that a resource was loaded from the cache and thus
 // the app may update progress with the amount of data loaded.
 void CheckCacheObjectStatus(DocLoader*, CachedResource*)
diff --git a/WebCore/storage/SQLTransactionSyncCallback.h b/WebCore/storage/SQLTransactionSyncCallback.h
index bd5b65c..eba82b0 100644
--- a/WebCore/storage/SQLTransactionSyncCallback.h
+++ b/WebCore/storage/SQLTransactionSyncCallback.h
@@ -31,10 +31,6 @@
 
 #if ENABLE(DATABASE)
 
-<<<<<<< HEAD
-// ANDROID
-=======
->>>>>>> webkit.org at r60469
 #include <wtf/RefCounted.h>
 #include <wtf/Threading.h>