| Index: webkit/glue/webclipboard_impl.cc
|
| diff --git a/webkit/glue/webclipboard_impl.cc b/webkit/glue/webclipboard_impl.cc
|
| index 9eddb68bd46f68f9c84b2a7e5a64d29e1e567b32..10dddab7ddc4adc02dd59cf252ee0ef1611066fa 100644
|
| --- a/webkit/glue/webclipboard_impl.cc
|
| +++ b/webkit/glue/webclipboard_impl.cc
|
| @@ -67,7 +67,15 @@ bool WebClipboardImpl::isFormatAvailable(Format format, Buffer buffer) {
|
| ui::Clipboard::FormatType format_type;
|
| ui::Clipboard::Buffer buffer_type;
|
|
|
| + if (!ConvertBufferType(buffer, &buffer_type))
|
| + return false;
|
| +
|
| switch (format) {
|
| + case FormatPlainText:
|
| + return ClipboardIsFormatAvailable(ui::Clipboard::GetPlainTextFormatType(),
|
| + buffer_type) ||
|
| + ClipboardIsFormatAvailable(ui::Clipboard::GetPlainTextWFormatType(),
|
| + buffer_type);
|
| case FormatHTML:
|
| format_type = ui::Clipboard::GetHtmlFormatType();
|
| break;
|
| @@ -84,9 +92,6 @@ bool WebClipboardImpl::isFormatAvailable(Format format, Buffer buffer) {
|
| return false;
|
| }
|
|
|
| - if (!ConvertBufferType(buffer, &buffer_type))
|
| - return false;
|
| -
|
| return ClipboardIsFormatAvailable(format_type, buffer_type);
|
| }
|
|
|
|
|