From 967717af5423377c967781471ee106e2bb4e11c8 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Thu, 22 Jul 2010 15:37:06 +0100
Subject: Merge WebKit at r63859 : Initial merge by git.

Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
---
 WebKit/chromium/tests/PopupMenuTest.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'WebKit/chromium/tests')

diff --git a/WebKit/chromium/tests/PopupMenuTest.cpp b/WebKit/chromium/tests/PopupMenuTest.cpp
index 6680d74..9aad6bb 100644
--- a/WebKit/chromium/tests/PopupMenuTest.cpp
+++ b/WebKit/chromium/tests/PopupMenuTest.cpp
@@ -68,6 +68,7 @@ public:
         str.append(String::number(listIndex));
         return str;
     }
+    virtual String itemLabel(unsigned) const { return String(); }
     virtual String itemToolTip(unsigned listIndex) const { return itemText(listIndex); }
     virtual String itemAccessibilityText(unsigned listIndex) const { return itemText(listIndex); }
     virtual bool itemIsEnabled(unsigned listIndex) const { return true; }
-- 
cgit v1.1