Switch to WebFrame from the WebKit API....

webkit/glue/webkit_glue.cc

 // Copyright (c) 2006-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.
 
 #include "config.h"
 #include "webkit/glue/webkit_glue.h"
 
 #if defined(OS_WIN)
 #include <objidl.h>
 #include <mlang.h>
@@ skipping 31 matching lines @@
 #include "webkit/api/public/win/WebInputEventFactory.h"
 #endif
 #include "webkit/glue/event_conversion.h"
 #include "webkit/glue/glue_serialize.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/webframe_impl.h"
 #include "webkit/glue/webview_impl.h"
 
 #include "webkit_version.h"  // Generated
 
+using WebKit::WebFrame;
 using WebKit::WebHistoryItem;
 using WebKit::WebString;
 using WebKit::WebVector;
 
 //------------------------------------------------------------------------------
 // webkit_glue impl:
 
 namespace webkit_glue {
 
 // Global variable used by the plugin quirk "die after unload".
@@ skipping 21 matching lines @@
     return std::wstring();
   }
   return StringToStdWString(documentElement->innerText());
 }
 
 std::wstring DumpFramesAsText(WebFrame* web_frame, bool recursive) {
   WebFrameImpl* webFrameImpl = static_cast<WebFrameImpl*>(web_frame);
   std::wstring result;
 
   // Add header for all but the main frame. Skip empty frames.
-  if (webFrameImpl->GetParent() &&
+  if (webFrameImpl->parent() &&
       webFrameImpl->frame()->document()->documentElement()) {
     result.append(L"\n--------\nFrame: '");
-    result.append(webFrameImpl->GetName());
+    result.append(UTF16ToWideHack(webFrameImpl->name()));
     result.append(L"'\n--------\n");
   }
 
   result.append(DumpDocumentText(web_frame));
   result.append(L"\n");
 
   if (recursive) {
     WebCore::Frame* child = webFrameImpl->frame()->tree()->firstChild();
     for (; child; child = child->tree()->nextSibling()) {
       result.append(
@@ skipping 12 matching lines @@
       WebCore::externalRepresentation(frame->contentRenderer());
   return StringToStdWString(frameText);
 }
 
 std::wstring DumpFrameScrollPosition(WebFrame* web_frame, bool recursive) {
   WebFrameImpl* webFrameImpl = static_cast<WebFrameImpl*>(web_frame);
   WebCore::IntSize offset = webFrameImpl->frameview()->scrollOffset();
   std::wstring result;
 
   if (offset.width() > 0 || offset.height() > 0) {
-    if (webFrameImpl->GetParent()) {
+    if (webFrameImpl->parent()) {
       StringAppendF(&result, L"frame '%ls' ", StringToStdWString(
           webFrameImpl->frame()->tree()->name()).c_str());
     }
     StringAppendF(&result, L"scrolled to %d,%d\n",
                   offset.width(), offset.height());
   }
 
   if (recursive) {
     WebCore::Frame* child = webFrameImpl->frame()->tree()->firstChild();
     for (; child; child = child->tree()->nextSibling()) {
@@ skipping 291 matching lines @@
   }
 
   g_forcefully_terminate_plugin_process = value;
 }
 
 bool ShouldForcefullyTerminatePluginProcess() {
   return g_forcefully_terminate_plugin_process;
 }
 
 } // namespace webkit_glue