Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / page / Chrome.cpp

diff --git a/src/third_party/WebKit/Source/core/page/Chrome.cpp b/src/third_party/WebKit/Source/core/page/Chrome.cpp
index e2fffaa..3fdd3ae 100644 (file)
--- a/src/third_party/WebKit/Source/core/page/Chrome.cpp
+++ b/src/third_party/WebKit/Source/core/page/Chrome.cpp
@@ -26,6 +26,8 @@
 #include "core/dom/Document.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLInputElement.h"
+#include "core/html/forms/ColorChooser.h"
+#include "core/html/forms/DateTimeChooser.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/FrameTree.h"
@@ -34,9 +36,8 @@
 #include "core/page/ScopedPageLoadDeferrer.h"
 #include "core/page/WindowFeatures.h"
 #include "core/rendering/HitTestResult.h"
-#include "platform/ColorChooser.h"
-#include "platform/DateTimeChooser.h"
 #include "platform/FileChooser.h"
+#include "platform/Logging.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/network/DNS.h"
 #include "public/platform/WebScreenInfo.h"
@@ -73,12 +74,6 @@ void Chrome::invalidateContentsForSlowScroll(const IntRect& updateRect)
     m_client->invalidateContentsForSlowScroll(updateRect);
 }
 
-void Chrome::scroll()
-{
-    m_client->scroll();
-    InspectorInstrumentation::didScroll(m_page);
-}
-
 IntRect Chrome::rootViewToScreen(const IntRect& rect) const
 {
     return m_client->rootViewToScreen(rect);
@@ -382,7 +377,7 @@ bool Chrome::hasOpenedPopup() const
     return m_client->hasOpenedPopup();
 }
 
-PassRefPtr<PopupMenu> Chrome::createPopupMenu(LocalFrame& frame, PopupMenuClient* client) const
+PassRefPtrWillBeRawPtr<PopupMenu> Chrome::createPopupMenu(LocalFrame& frame, PopupMenuClient* client) const
 {
     notifyPopupOpeningObservers();
     return m_client->createPopupMenu(frame, client);