From ca9cb53ed1119a3fd98fafa0972ffeb56dee1c24 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Thu, 8 Jul 2010 12:51:48 +0100 Subject: Merge WebKit at r62496: Initial merge by git Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2 --- WebKit/chromium/tests/PopupMenuTest.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'WebKit/chromium/tests') diff --git a/WebKit/chromium/tests/PopupMenuTest.cpp b/WebKit/chromium/tests/PopupMenuTest.cpp index 2756f9d..9a45dc2 100644 --- a/WebKit/chromium/tests/PopupMenuTest.cpp +++ b/WebKit/chromium/tests/PopupMenuTest.cpp @@ -122,12 +122,14 @@ public: virtual bool handleInputEvent(const WebInputEvent&) { return true; } virtual void mouseCaptureLost() { } virtual void setFocus(bool) { } - virtual bool handleCompositionEvent(WebCompositionCommand command, - int cursorPosition, - int targetStart, - int targetEnd, - const WebString& text) { return true; } - virtual bool queryCompositionStatus(bool* enabled, WebRect* caretBounds) { return true; } + virtual bool setComposition( + const WebString& text, + const WebVector& underlines, + int selectionStart, + int selectionEnd) { return true; } + virtual bool confirmComposition() { return true; } + virtual WebTextInputType textInputType() { return WebKit::WebTextInputTypeNone; } + virtual WebRect caretOrSelectionBounds() { return WebRect(); } virtual void setTextDirection(WebTextDirection) { } }; @@ -167,7 +169,7 @@ public: protected: virtual void SetUp() { - m_webView = static_cast(WebView::create(&m_webviewClient)); + m_webView = static_cast(WebView::create(&m_webviewClient, 0)); m_webView->initializeMainFrame(&m_webFrameClient); m_popupMenu = PopupMenu::create(&m_popupMenuClient); } -- cgit v1.1