Roll webkit deps 48155:48185 and remove a couple of passing tests from test_expectations.txt.

Also, merge in http://codereview.chromium.org/174367 (original author: vandebo@chromium.org), which is the downstream half of r48168.

BUG=4360
BUG=21228
BUG=18792
TEST=none
TBR=eroman


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25669 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 34 insertions, 23 deletions

diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 6aa8922..54aeab7 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -586,9 +586,6 @@ WONTFIX : LayoutTests/storage/domstorage/sessionstorage/private-browsing-affects
 // Depends on SessionStorage.  I'm not sure if this is working yet, but I don't think we need to SKIP it.
 BUG4360 : LayoutTests/http/tests/loading/deleted-host-in-resource-load-delegate-callback.html = TIMEOUT
 
-// WebKit and us disagree how this is best done.  Disable for now.
-BUG4360 : LayoutTests/storage/domstorage/localstorage/complex-keys.html = FAIL
-
 // Database
 BUG4359 SKIP : LayoutTests/storage/close-during-stress-test.html = PASS
 BUG4359 SKIP : LayoutTests/storage/database-lock-after-reload.html = PASS
@@ -1993,9 +1990,6 @@ BUG11123 LINUX : LayoutTests/fast/css/nested-layers-with-hover.html = FAIL
 BUG11123 LINUX : LayoutTests/fast/forms/textarea-scrollbar.html = FAIL
 BUG11123 LINUX : LayoutTests/fast/forms/textarea-scrolled-type.html = FAIL
 
-// New tests from WebKit Merge 42932:42994
-BUG21128 : LayoutTests/http/tests/xmlhttprequest/detaching-frame-2.html = FAIL
-
 // Chrome does not support WebArchives (just like Safari for Windows),
 // although we might eventually want to on Mac.
 WONTFIX SKIP : LayoutTests/webarchive/adopt-attribute-styled-body-webarchive.html = FAIL
@@ -2433,9 +2427,8 @@ BUG_VICTORW : LayoutTests/http/tests/security/javascriptURL/xss-ALLOWED-from-jav
 // Webkit 48061:48071
 BUG_VICTORW WIN DEBUG : LayoutTests/fast/regex/cross-frame-callable.html = TIMEOUT
 
-// Webkit 48071:48078
-BUG_VICTORW MAC : LayoutTests/fast/forms/enter-clicks-buttons.html = CRASH
-
 // WebKit 48098:48155
 BUG21267 : LayoutTests/fast/events/click-focus-anchor.html = FAIL
 BUG21267 : LayoutTests/fast/events/tab-focus-anchor.html = FAIL
+
+BUG_JAPHET MAC : LayoutTests/animations/change-keyframes-name.html = FAIL PASS
diff --git a/webkit/tools/test_shell/mock_webclipboard_impl.cc b/webkit/tools/test_shell/mock_webclipboard_impl.cc
index 32f3f01..7a428be 100644
--- a/webkit/tools/test_shell/mock_webclipboard_impl.cc
+++ b/webkit/tools/test_shell/mock_webclipboard_impl.cc
@@ -16,7 +16,7 @@
 using WebKit::WebString;
 using WebKit::WebURL;
 
-bool MockWebClipboardImpl::isFormatAvailable(Format format) {
+bool MockWebClipboardImpl::isFormatAvailable(Format format, Buffer buffer) {
   switch (format) {
     case FormatHTML:
       return !m_htmlText.isEmpty();
@@ -28,15 +28,30 @@ bool MockWebClipboardImpl::isFormatAvailable(Format format) {
       NOTREACHED();
       return false;
   }
+
+  switch (buffer) {
+    case BufferStandard:
+      break;
+    case BufferSelection:
+#if defined(OS_LINUX)
+      break;
+#endif
+    default:
+      NOTREACHED();
+      return false;
+  }
+
   return true;
 }
 
-WebKit::WebString MockWebClipboardImpl::readPlainText() {
+WebKit::WebString MockWebClipboardImpl::readPlainText(
+    WebKit::WebClipboard::Buffer buffer) {
   return m_plainText;
 }
 
 // TODO(wtc): set output argument *url.
-WebKit::WebString MockWebClipboardImpl::readHTML(WebKit::WebURL* url) {
+WebKit::WebString MockWebClipboardImpl::readHTML(
+    WebKit::WebClipboard::Buffer buffer, WebKit::WebURL* url) {
   return m_htmlText;
 }
 
diff --git a/webkit/tools/test_shell/mock_webclipboard_impl.h b/webkit/tools/test_shell/mock_webclipboard_impl.h
index dd47835..4aa616f 100644
--- a/webkit/tools/test_shell/mock_webclipboard_impl.h
+++ b/webkit/tools/test_shell/mock_webclipboard_impl.h
@@ -15,10 +15,12 @@
 
 class MockWebClipboardImpl : public WebKit::WebClipboard {
  public:
-  virtual bool isFormatAvailable(WebKit::WebClipboard::Format);
+  virtual bool isFormatAvailable(WebKit::WebClipboard::Format,
+                                 WebKit::WebClipboard::Buffer);
 
-  virtual WebKit::WebString readPlainText();
-  virtual WebKit::WebString readHTML(WebKit::WebURL*);
+  virtual WebKit::WebString readPlainText(WebKit::WebClipboard::Buffer);
+  virtual WebKit::WebString readHTML(WebKit::WebClipboard::Buffer,
+                                     WebKit::WebURL*);
 
   virtual void writeHTML(
       const WebKit::WebString& htmlText, const WebKit::WebURL&,
diff --git a/webkit/tools/test_shell/simple_clipboard_impl.cc b/webkit/tools/test_shell/simple_clipboard_impl.cc
index 323c04c..fc67ece 100644
--- a/webkit/tools/test_shell/simple_clipboard_impl.cc
+++ b/webkit/tools/test_shell/simple_clipboard_impl.cc
@@ -33,21 +33,22 @@ Clipboard* ClipboardGetClipboard() {
   return clipboard.Pointer();
 }
 
-bool ClipboardIsFormatAvailable(const Clipboard::FormatType& format) {
-  return ClipboardGetClipboard()->IsFormatAvailable(format);
+bool ClipboardIsFormatAvailable(const Clipboard::FormatType& format,
+                                Clipboard::Buffer buffer) {
+  return ClipboardGetClipboard()->IsFormatAvailable(format, buffer);
 }
 
-void ClipboardReadText(string16* result) {
-  ClipboardGetClipboard()->ReadText(result);
+void ClipboardReadText(Clipboard::Buffer buffer, string16* result) {
+  ClipboardGetClipboard()->ReadText(buffer, result);
 }
 
-void ClipboardReadAsciiText(std::string* result) {
-  ClipboardGetClipboard()->ReadAsciiText(result);
+void ClipboardReadAsciiText(Clipboard::Buffer buffer, std::string* result) {
+  ClipboardGetClipboard()->ReadAsciiText(buffer, result);
 }
 
-void ClipboardReadHTML(string16* markup, GURL* url) {
+void ClipboardReadHTML(Clipboard::Buffer buffer, string16* markup, GURL* url) {
   std::string url_str;
-  ClipboardGetClipboard()->ReadHTML(markup, url ? &url_str : NULL);
+  ClipboardGetClipboard()->ReadHTML(buffer, markup, url ? &url_str : NULL);
   if (url)
     *url = GURL(url_str);
 }