1 files changed, 37 insertions, 11 deletions
diff --git a/WebKit/chromium/src/WebPopupMenuImpl.cpp b/WebKit/chromium/src/WebPopupMenuImpl.cpp
index f6d360e..75d6cc1 100644
--- a/WebKit/chromium/src/WebPopupMenuImpl.cpp
+++ b/WebKit/chromium/src/WebPopupMenuImpl.cpp
@@ -56,7 +56,8 @@ namespace WebKit {
 
 WebPopupMenu* WebPopupMenu::create(WebWidgetClient* client)
 {
-    return new WebPopupMenuImpl(client);
+    // Pass the WebPopupMenuImpl's self-reference to the caller.
+    return adoptRef(new WebPopupMenuImpl(client)).leakRef();
 }
 
 // WebWidget ------------------------------------------------------------------
@@ -230,18 +231,28 @@ void WebPopupMenuImpl::setFocus(bool enable)
 {
 }
 
-bool WebPopupMenuImpl::handleCompositionEvent(
-    WebCompositionCommand command, int cursorPosition, int targetStart,
-    int targetEnd, const WebString& imeString)
+bool WebPopupMenuImpl::setComposition(
+    const WebString& text, const WebVector<WebCompositionUnderline>& underlines,
+    int selectionStart, int selectionEnd)
 {
     return false;
 }
 
-bool WebPopupMenuImpl::queryCompositionStatus(bool* enabled, WebRect* caretRect)
+bool WebPopupMenuImpl::confirmComposition()
 {
     return false;
 }
 
+WebTextInputType WebPopupMenuImpl::textInputType()
+{
+    return WebTextInputTypeNone;
+}
+
+WebRect WebPopupMenuImpl::caretOrSelectionBounds()
+{
+    return WebRect();
+}
+
 void WebPopupMenuImpl::setTextDirection(WebTextDirection direction)
 {
 }
@@ -250,18 +261,29 @@ void WebPopupMenuImpl::setTextDirection(WebTextDirection direction)
 //-----------------------------------------------------------------------------
 // WebCore::HostWindow
 
-void WebPopupMenuImpl::repaint(const IntRect& paintRect,
-                               bool contentChanged,
-                               bool immediate,
-                               bool repaintContentOnly)
+void WebPopupMenuImpl::invalidateContents(const IntRect&, bool)
+{
+    notImplemented();
+}
+
+void WebPopupMenuImpl::invalidateWindow(const IntRect&, bool)
 {
-    // Ignore spurious calls.
-    if (!contentChanged || paintRect.isEmpty())
+    notImplemented();
+}
+
+void WebPopupMenuImpl::invalidateContentsAndWindow(const IntRect& paintRect, bool /*immediate*/)
+{
+    if (paintRect.isEmpty())
         return;
     if (m_client)
         m_client->didInvalidateRect(paintRect);
 }
 
+void WebPopupMenuImpl::invalidateContentsForSlowScroll(const IntRect& updateRect, bool immediate)
+{
+    invalidateContentsAndWindow(updateRect, immediate);
+}
+
 void WebPopupMenuImpl::scroll(const IntSize& scrollDelta,
                               const IntRect& scrollRect,
                               const IntRect& clipRect)
@@ -296,6 +318,10 @@ void WebPopupMenuImpl::scrollbarsModeDidChange() const
     // Nothing to be done since we have no concept of different scrollbar modes.
 }
 
+void WebPopupMenuImpl::setCursor(const WebCore::Cursor&)
+{
+}
+
 //-----------------------------------------------------------------------------
 // WebCore::FramelessScrollViewClient