Merge WebKit at r78450: Initial merge by git.

Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1

5 files changed, 7 insertions, 16 deletions

diff --git a/Source/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp b/Source/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp
index 01b9c1d..6ed11ea 100644
--- a/Source/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp
+++ b/Source/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp
@@ -388,13 +388,12 @@ void ChromeClientHaiku::formStateDidChange(const Node*)
     notImplemented();
 }
 
-PassOwnPtr<HTMLParserQuirks> ChromeClientHaiku::createHTMLParserQuirks()
+bool ChromeClientHaiku::selectItemWritingDirectionIsNatural()
 {
-    notImplemented();
-    return 0;
+    return false;
 }
 
-bool ChromeClientHaiku::selectItemWritingDirectionIsNatural()
+bool ChromeClientHaiku::selectItemAlignmentFollowsMenuWritingDirection()
 {
     return false;
 }
diff --git a/Source/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h b/Source/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h
index deb3678..3298c37 100644
--- a/Source/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h
+++ b/Source/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h
@@ -133,6 +133,7 @@ namespace WebCore {
 #endif
 
         virtual bool selectItemWritingDirectionIsNatural();
+        virtual bool selectItemAlignmentFollowsMenuWritingDirection();
         virtual PassRefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const;
         virtual PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const;
 
@@ -157,8 +158,6 @@ namespace WebCore {
         // Notification that the given form element has changed. This function
         // will be called frequently, so handling should be very fast.
         virtual void formStateDidChange(const Node*);
-
-        virtual PassOwnPtr<HTMLParserQuirks> createHTMLParserQuirks();
     };
 
 } // namespace WebCore
diff --git a/Source/WebKit/haiku/WebCoreSupport/DragClientHaiku.cpp b/Source/WebKit/haiku/WebCoreSupport/DragClientHaiku.cpp
index 8964c69..4a8f9f4 100644
--- a/Source/WebKit/haiku/WebCoreSupport/DragClientHaiku.cpp
+++ b/Source/WebKit/haiku/WebCoreSupport/DragClientHaiku.cpp
@@ -64,11 +64,5 @@ void DragClientHaiku::startDrag(DragImageRef dragImage, const IntPoint&, const I
     notImplemented();
 }
 
-DragImageRef DragClientHaiku::createDragImageForLink(KURL&, const String&, Frame*)
-{
-    notImplemented();
-    return 0;
-}
-
 } // namespace WebCore
 
diff --git a/Source/WebKit/haiku/WebCoreSupport/DragClientHaiku.h b/Source/WebKit/haiku/WebCoreSupport/DragClientHaiku.h
index b184322..40860e3 100644
--- a/Source/WebKit/haiku/WebCoreSupport/DragClientHaiku.h
+++ b/Source/WebKit/haiku/WebCoreSupport/DragClientHaiku.h
@@ -39,7 +39,6 @@ namespace WebCore {
         virtual void willPerformDragSourceAction(DragSourceAction, const IntPoint&, Clipboard*);
         virtual void startDrag(DragImageRef dragImage, const IntPoint& dragImageOrigin,
                                const IntPoint& eventPos, Clipboard*, Frame*, bool linkDrag = false);
-        virtual DragImageRef createDragImageForLink(KURL&, const String& label, Frame*);
     };
 
 } // namespace WebCore
diff --git a/Source/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp b/Source/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp
index 48c65a1..46ac489 100644
--- a/Source/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp
+++ b/Source/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp
@@ -261,7 +261,7 @@ void FrameLoaderClientHaiku::dispatchDidFinishDocumentLoad()
 {
     if (m_webView) {
         BMessage message(LOAD_DOC_COMPLETED);
-        message.AddString("url", m_frame->loader()->url().string());
+        message.AddString("url", m_frame->document()->url().string());
         m_messenger->SendMessage(&message);
     }
 }
@@ -323,7 +323,7 @@ void FrameLoaderClientHaiku::postProgressFinishedNotification()
 {
     if (m_webView) {
         BMessage message(LOAD_DL_COMPLETED);
-        message.AddString("url", m_frame->loader()->url().string());
+        message.AddString("url", m_frame->document()->url().string());
         m_messenger->SendMessage(&message);
     }
 }
@@ -729,7 +729,7 @@ PassRefPtr<Frame> FrameLoaderClientHaiku::createFrame(const KURL& url, const Str
     childFrame->tree()->setName(name);
     m_frame->tree()->appendChild(childFrame);
 
-    childFrame->loader()->loadURLIntoChildFrame(url, referrer, childFrame.get());
+    m_frame->loader()->loadURLIntoChildFrame(url, referrer, childFrame.get());
 
     // The frame's onload handler may have removed it from the document.
     if (!childFrame->tree()->parent())