1 files changed, 18 insertions, 14 deletions
diff --git a/WebKit/chromium/src/WebPopupMenuImpl.h b/WebKit/chromium/src/WebPopupMenuImpl.h
index 13eb674..221ba03 100644
--- a/WebKit/chromium/src/WebPopupMenuImpl.h
+++ b/WebKit/chromium/src/WebPopupMenuImpl.h
@@ -31,14 +31,10 @@
 #ifndef WebPopupMenuImpl_h
 #define WebPopupMenuImpl_h
 
-// FIXME: Add this to FramelessScrollViewClient.h
-namespace WebCore { class FramelessScrollView; }
-
 #include "FramelessScrollViewClient.h"
-// FIXME: remove the relative paths once glue/ consumers are removed.
-#include "../public/WebPoint.h"
-#include "../public/WebPopupMenu.h"
-#include "../public/WebSize.h"
+#include "WebPoint.h"
+#include "WebPopupMenu.h"
+#include "WebSize.h"
 #include <wtf/RefCounted.h>
 
 namespace WebCore {
@@ -67,14 +63,20 @@ public:
     virtual void resize(const WebSize&);
     virtual void layout();
     virtual void paint(WebCanvas* canvas, const WebRect& rect);
+    virtual void themeChanged();
+    virtual void composite(bool finish);
     virtual bool handleInputEvent(const WebInputEvent&);
     virtual void mouseCaptureLost();
     virtual void setFocus(bool enable);
-    virtual bool handleCompositionEvent(
-        WebCompositionCommand command, int cursorPosition,
-        int targetStart, int targetEnd, const WebString& text);
-    virtual bool queryCompositionStatus(bool* enabled, WebRect* caretRect);
+    virtual bool setComposition(
+        const WebString& text,
+        const WebVector<WebCompositionUnderline>& underlines,
+        int selectionStart, int selectionEnd);
+    virtual bool confirmComposition();
+    virtual WebTextInputType textInputType();
+    virtual WebRect caretOrSelectionBounds();
     virtual void setTextDirection(WebTextDirection direction);
+    virtual bool isAcceleratedCompositingActive() const { return false; }
 
     // WebPopupMenuImpl
     void Init(WebCore::FramelessScrollView* widget,
@@ -98,9 +100,10 @@ public:
     ~WebPopupMenuImpl();
 
     // WebCore::HostWindow methods:
-    virtual void repaint(
-        const WebCore::IntRect&, bool contentChanged, bool immediate = false,
-        bool repaintContentOnly = false);
+    virtual void invalidateContents(const WebCore::IntRect&, bool);
+    virtual void invalidateWindow(const WebCore::IntRect&, bool);
+    virtual void invalidateContentsAndWindow(const WebCore::IntRect&, bool);
+    virtual void invalidateContentsForSlowScroll(const WebCore::IntRect&, bool);
     virtual void scroll(
         const WebCore::IntSize& scrollDelta, const WebCore::IntRect& scrollRect,
         const WebCore::IntRect& clipRect);
@@ -109,6 +112,7 @@ public:
     virtual PlatformPageClient platformPageClient() const { return 0; }
     virtual void scrollRectIntoView(const WebCore::IntRect&, const WebCore::ScrollView*) const;
     virtual void scrollbarsModeDidChange() const;
+    virtual void setCursor(const WebCore::Cursor&);
 
     // WebCore::FramelessScrollViewClient methods:
     virtual void popupClosed(WebCore::FramelessScrollView*);