Switch to WebFrame from the WebKit API....

chrome/renderer/print_web_view_helper.cc

 // Copyright (c) 2009 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 "chrome/renderer/print_web_view_helper.h"
 
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/render_view.h"
 #include "grit/generated_resources.h"
 #include "printing/units.h"
+#include "webkit/api/public/WebFrame.h"
 #include "webkit/api/public/WebRect.h"
 #include "webkit/api/public/WebScreenInfo.h"
 #include "webkit/api/public/WebSize.h"
 #include "webkit/api/public/WebURLRequest.h"
-#include "webkit/glue/webframe.h"
 
+using WebKit::WebFrame;
 using WebKit::WebRect;
 using WebKit::WebScreenInfo;
 using WebKit::WebString;
 using WebKit::WebURLRequest;
 
 PrepareFrameAndViewForPrint::PrepareFrameAndViewForPrint(
     const ViewMsg_Print_Params& print_params,
     WebFrame* frame,
     WebView* web_view)
         : frame_(frame), web_view_(web_view), expected_pages_count_(0) {
@@ skipping 14 matching lines @@
   // minimum (default) scaling.
   // This is important for sites that try to fill the page.
   gfx::Size print_layout_size(print_canvas_size_);
   print_layout_size.set_height(static_cast<int>(
       static_cast<double>(print_layout_size.height()) * 1.25));
 
   prev_view_size_ = web_view->size();
 
   web_view->resize(print_layout_size);
 
-  expected_pages_count_ = frame->PrintBegin(print_canvas_size_);
+  expected_pages_count_ = frame->printBegin(print_canvas_size_);
 }
 
 PrepareFrameAndViewForPrint::~PrepareFrameAndViewForPrint() {
-  frame_->PrintEnd();
+  frame_->printEnd();
   web_view_->resize(prev_view_size_);
 }
 
 
 PrintWebViewHelper::PrintWebViewHelper(RenderView* render_view)
     : render_view_(render_view),
       user_cancelled_scripted_print_count_(0) {}
 
 PrintWebViewHelper::~PrintWebViewHelper() {}
 
@@ skipping 13 matching lines @@
     print_web_view_.release();  // Close deletes object.
     print_pages_params_.reset();
   }
 }
 
 bool PrintWebViewHelper::CopyAndPrint(const ViewMsg_PrintPages_Params& params,
                                       WebFrame* web_frame) {
   // Create a new WebView with the same settings as the current display one.
   // Except that we disable javascript (don't want any active content running
   // on the page).
-  WebPreferences prefs = web_frame->GetView()->GetPreferences();
+  WebPreferences prefs = web_frame->view()->GetPreferences();
   prefs.javascript_enabled = false;
   prefs.java_enabled = false;
   print_web_view_.reset(WebView::Create(this, prefs));
 
   print_pages_params_.reset(new ViewMsg_PrintPages_Params(params));
   print_pages_params_->pages.clear();  // Print all pages of selection.
 
-  std::string html = web_frame->GetSelection(true);
+  std::string html = web_frame->selectionAsMarkup().utf8();
   std::string url_str = "data:text/html;charset=utf-8,";
   url_str.append(html);
   GURL url(url_str);
 
   // When loading is done this will call DidStopLoading that will do the
   // actual printing.
-  print_web_view_->GetMainFrame()->LoadRequest(WebURLRequest(url));
+  print_web_view_->GetMainFrame()->loadRequest(WebURLRequest(url));
 
   return true;
 }
 
 void PrintWebViewHelper::PrintPages(const ViewMsg_PrintPages_Params& params,
                                     WebFrame* frame) {
   PrepareFrameAndViewForPrint prep_frame_view(params.params,
                                               frame,
-                                              frame->GetView());
+                                              frame->view());
   int page_count = prep_frame_view.GetExpectedPageCount();
 
   Send(new ViewHostMsg_DidGetPrintedPagesCount(routing_id(),
                                                params.params.document_cookie,
                                                page_count));
   if (page_count) {
     ViewMsg_PrintPage_Params page_params;
     page_params.params = params.params;
     if (params.pages.empty()) {
       for (int i = 0; i < page_count; ++i) {
@@ skipping 35 matching lines @@
 WebScreenInfo PrintWebViewHelper::screenInfo() {
   NOTREACHED();
   return WebScreenInfo();
 }
 
 void PrintWebViewHelper::DidStopLoading(WebView* webview) {
   DCHECK(print_pages_params_.get() != NULL);
   DCHECK_EQ(webview, print_web_view_.get());
   PrintPages(*print_pages_params_.get(), print_web_view_->GetMainFrame());
 }