Merge WebKit at r71558: Initial merge by git.

[android-x86/external-webkit.git] / WebCore / page / Chrome.cpp

diff --git a/WebCore/page/Chrome.cpp b/WebCore/page/Chrome.cpp
index 762b087..83d0f85 100644 (file)
--- a/WebCore/page/Chrome.cpp
+++ b/WebCore/page/Chrome.cpp
@@ -87,6 +87,13 @@ void Chrome::scroll(const IntSize& scrollDelta, const IntRect& rectToScroll, con
     m_client->scroll(scrollDelta, rectToScroll, clipRect);
 }
 
+#if ENABLE(TILED_BACKING_STORE)
+void Chrome::delegatedScrollRequested(const IntSize& scrollDelta)
+{
+    m_client->delegatedScrollRequested(scrollDelta);
+}
+#endif
+
 IntPoint Chrome::screenToWindow(const IntPoint& point) const
 {
     return m_client->screenToWindow(point);
@@ -163,6 +170,11 @@ void Chrome::focusedNodeChanged(Node* node) const
     m_client->focusedNodeChanged(node);
 }
 
+void Chrome::focusedFrameChanged(Frame* frame) const
+{
+    m_client->focusedFrameChanged(frame);
+}
+
 Page* Chrome::createWindow(Frame* frame, const FrameLoadRequest& request, const WindowFeatures& features, const NavigationAction& action) const
 {
     Page* newPage = m_client->createWindow(frame, request, features, action);
@@ -502,4 +514,11 @@ PassRefPtr<SearchPopupMenu> Chrome::createSearchPopupMenu(PopupMenuClient* clien
     return m_client->createSearchPopupMenu(client);
 }
 
+#if ENABLE(CONTEXT_MENUS)
+void Chrome::showContextMenu()
+{
+    m_client->showContextMenu();
+}
+#endif
+
 } // namespace WebCore