Switch to WebFrame from the WebKit API....

webkit/tools/test_shell/test_webview_delegate_gtk.cc

 // Copyright (c) 2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file was forked off the Mac port.
 
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
 #include "base/gfx/gtk_util.h"
 #include "base/gfx/point.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "net/base/net_errors.h"
 #include "chrome/common/page_transition_types.h"
+#include "webkit/api/public/WebCString.h"
 #include "webkit/api/public/WebCursorInfo.h"
+#include "webkit/api/public/WebFrame.h"
 #include "webkit/api/public/WebRect.h"
+#include "webkit/api/public/WebString.h"
 #include "webkit/glue/webcursor.h"
 #include "webkit/glue/webdropdata.h"
-#include "webkit/glue/webframe.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/webplugin.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webview.h"
 #include "webkit/glue/plugins/gtk_plugin_container_manager.h"
 #include "webkit/glue/plugins/plugin_list.h"
 #include "webkit/glue/window_open_disposition.h"
 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
 #include "webkit/tools/test_shell/test_navigation_controller.h"
 #include "webkit/tools/test_shell/test_shell.h"
 
 using WebKit::WebCursorInfo;
+using WebKit::WebFrame;
 using WebKit::WebNavigationPolicy;
 using WebKit::WebRect;
 
 namespace {
 
 enum SelectionClipboardType {
   TEXT_HTML,
   PLAIN_TEXT,
 };
 
 GdkAtom GetTextHtmlAtom() {
   GdkAtom kTextHtmlGdkAtom = gdk_atom_intern_static_string("text/html");
   return kTextHtmlGdkAtom;
 }
 
 void SelectionClipboardGetContents(GtkClipboard* clipboard,
     GtkSelectionData* selection_data, guint info, gpointer data) {
   // Ignore formats that we don't know about.
   if (info != TEXT_HTML && info != PLAIN_TEXT)
     return;
 
   WebView* webview = static_cast<WebView*>(data);
   WebFrame* frame = webview->GetFocusedFrame();
   if (!frame)
     frame = webview->GetMainFrame();
   DCHECK(frame);
 
-  std::string selection = frame->GetSelection(TEXT_HTML == info);
+  std::string selection;
+  if (TEXT_HTML == info) {
+    selection = frame->selectionAsMarkup().utf8();
+  } else {
+    selection = frame->selectionAsText().utf8();
+  }
   if (TEXT_HTML == info) {
     gtk_selection_data_set(selection_data,
                            GetTextHtmlAtom(),
                            8 /* bits per data unit, ie, char */,
                            reinterpret_cast<const guchar*>(selection.data()),
                            selection.length());
   } else {
     gtk_selection_data_set_text(selection_data, selection.data(),
         selection.length());
   }
@@ skipping 177 matching lines @@
 // Private methods -----------------------------------------------------------
 
 void TestWebViewDelegate::SetPageTitle(const std::wstring& title) {
   gtk_window_set_title(GTK_WINDOW(shell_->mainWnd()),
                        ("Test Shell - " + WideToUTF8(title)).c_str());
 }
 
 void TestWebViewDelegate::SetAddressBarURL(const GURL& url) {
   gtk_entry_set_text(GTK_ENTRY(shell_->editWnd()), url.spec().c_str());
 }