Merge webkit.org at r54731 : Initial merge by git

Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a

8 files changed, 19 insertions, 6 deletions

diff --git a/WebCore/platform/haiku/ClipboardHaiku.cpp b/WebCore/platform/haiku/ClipboardHaiku.cpp
index a62c30c..f73be01 100644
--- a/WebCore/platform/haiku/ClipboardHaiku.cpp
+++ b/WebCore/platform/haiku/ClipboardHaiku.cpp
@@ -187,6 +187,11 @@ void ClipboardHaiku::writeRange(Range*, Frame*)
     notImplemented();
 }
 
+void ClipboardHaiku::writePlainText(const String&)
+{
+    notImplemented();
+}
+
 bool ClipboardHaiku::hasData()
 {
     bool result = false;
diff --git a/WebCore/platform/haiku/ClipboardHaiku.h b/WebCore/platform/haiku/ClipboardHaiku.h
index 23e3d7b..37ffe5c 100644
--- a/WebCore/platform/haiku/ClipboardHaiku.h
+++ b/WebCore/platform/haiku/ClipboardHaiku.h
@@ -61,6 +61,7 @@ namespace WebCore {
         virtual void declareAndWriteDragImage(Element*, const KURL&, const String& title, Frame*);
         virtual void writeURL(const KURL&, const String&, Frame*);
         virtual void writeRange(Range*, Frame*);
+        virtual void writePlainText(const String&);
 
         virtual bool hasData();
 
diff --git a/WebCore/platform/haiku/ContextMenuItemHaiku.cpp b/WebCore/platform/haiku/ContextMenuItemHaiku.cpp
index cd5abaf..469590d 100644
--- a/WebCore/platform/haiku/ContextMenuItemHaiku.cpp
+++ b/WebCore/platform/haiku/ContextMenuItemHaiku.cpp
@@ -70,7 +70,7 @@ ContextMenuItem::~ContextMenuItem()
 PlatformMenuItemDescription ContextMenuItem::releasePlatformDescription()
 {
     BMenuItem* item = m_platformDescription;
-    m_platformDescription = NULL;
+    m_platformDescription = 0;
     return item;
 }
 
@@ -116,7 +116,7 @@ void ContextMenuItem::setAction(ContextMenuAction action)
         m_platformDescription->Message()->what = action;
 }
 
-String ContextMenuItem::title() const 
+String ContextMenuItem::title() const
 {
     if (m_platformDescription)
         return "";
diff --git a/WebCore/platform/haiku/CookieJarHaiku.cpp b/WebCore/platform/haiku/CookieJarHaiku.cpp
index 831b379..f619f00 100644
--- a/WebCore/platform/haiku/CookieJarHaiku.cpp
+++ b/WebCore/platform/haiku/CookieJarHaiku.cpp
@@ -52,6 +52,12 @@ String cookies(const Document*, const KURL& url)
     return cookieJar.get(url.string());
 }
 
+String cookieRequestHeaderFieldValue(const Document*, const KURL& url)
+{
+    // FIXME: include HttpOnly cookies.
+    return cookieJar.get(url.string());
+}
+
 bool cookiesEnabled(const Document*)
 {
     // FIXME: This should probably be a setting
diff --git a/WebCore/platform/haiku/DragImageHaiku.cpp b/WebCore/platform/haiku/DragImageHaiku.cpp
index 17a79f4..87f780a 100644
--- a/WebCore/platform/haiku/DragImageHaiku.cpp
+++ b/WebCore/platform/haiku/DragImageHaiku.cpp
@@ -67,7 +67,7 @@ DragImageRef createDragImageFromImage(Image*)
 DragImageRef createDragImageIconForCachedImage(CachedImage*)
 {
     notImplemented();
-    return 0;     
+    return 0;
 }
 
 } // namespace WebCore
diff --git a/WebCore/platform/haiku/FileChooserHaiku.cpp b/WebCore/platform/haiku/FileChooserHaiku.cpp
index f56e02b..3a44de8 100644
--- a/WebCore/platform/haiku/FileChooserHaiku.cpp
+++ b/WebCore/platform/haiku/FileChooserHaiku.cpp
@@ -22,8 +22,8 @@
 #include "config.h"
 #include "FileChooser.h"
 
-#include "NotImplemented.h"
 #include "Icon.h"
+#include "NotImplemented.h"
 
 
 namespace WebCore {
diff --git a/WebCore/platform/haiku/LocalizedStringsHaiku.cpp b/WebCore/platform/haiku/LocalizedStringsHaiku.cpp
index 3b94bcb..5321792 100644
--- a/WebCore/platform/haiku/LocalizedStringsHaiku.cpp
+++ b/WebCore/platform/haiku/LocalizedStringsHaiku.cpp
@@ -28,6 +28,7 @@
 #include "config.h"
 #include "LocalizedStrings.h"
 
+#include "NotImplemented.h"
 #include "PlatformString.h"
 
 
diff --git a/WebCore/platform/haiku/PlatformWheelEventHaiku.cpp b/WebCore/platform/haiku/PlatformWheelEventHaiku.cpp
index 3945f48..21003b6 100644
--- a/WebCore/platform/haiku/PlatformWheelEventHaiku.cpp
+++ b/WebCore/platform/haiku/PlatformWheelEventHaiku.cpp
@@ -54,8 +54,8 @@ PlatformWheelEvent::PlatformWheelEvent(BMessage* message)
     m_wheelTicksX = m_deltaX;
     m_wheelTicksY = m_deltaY;
 
-    m_deltaX *= -cScrollbarPixelsPerLineStep;
-    m_deltaY *= -cScrollbarPixelsPerLineStep;
+    m_deltaX *= -Scrollbar::pixelsPerLineStep();
+    m_deltaY *= -Scrollbar::pixelsPerLineStep();
 }
 
 } // namespace WebCore