Revert WebFrameImpl::ComputePageRects() rev 9258 changes

webkit/glue/webframe_impl.cc

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 79 matching lines @@
 #include "FrameLoadRequest.h"
 #include "FrameTree.h"
 #include "FrameView.h"
 #include "GraphicsContext.h"
 #include "HTMLHeadElement.h"
 #include "HTMLLinkElement.h"
 #include "HistoryItem.h"
 #include "markup.h"
 #include "Page.h"
 #include "PlatformContextSkia.h"
-#include "PrintContext.h"
 #include "RenderFrame.h"
 #if defined(OS_WIN)
 #include "RenderThemeChromiumWin.h"
 #endif
 #include "RenderWidget.h"
 #include "ReplaceSelectionCommand.h"
 #include "ResourceHandle.h"
 #include "ResourceRequest.h"
 #include "ScriptController.h"
 #include "ScriptSourceCode.h"
@@ skipping 1651 matching lines @@
     NOTREACHED();
     return 0;
   }
   // In Safari, they are using:
   // (0,0) + soft margins top/left
   // (phys width, phys height) - hard margins -
   //     soft margins top/left - soft margins right/bottom
   // TODO(maruel): Weird. We don't do that.
   // Everything is in pixels :(
   // pages_ and page_height are actually output parameters.
-  WebCore::FloatRect rect(0, 0,
-                                                  static_cast<float>(page_size_px.width()),
-                                                  static_cast<float>(page_size_px.height()));
-  WebCore::PrintContext print_context(frame());
-  float page_height;
-  print_context.computePageRects(rect, 0, 0, 1.0, page_height);
-  return print_context.pageCount();
+  int page_height;
+  WebCore::IntRect rect(0, 0, page_size_px.width(), page_size_px.height());
+  computePageRectsForFrame(frame(), rect, 0, 0, 1.0, pages_, page_height);
+  return pages_.size();
 }
 
 void WebFrameImpl::GetPageRect(int page, gfx::Rect* page_size) const {
   if (page < 0 || page >= static_cast<int>(pages_.size())) {
     NOTREACHED();
     return;
   }
   *page_size = webkit_glue::FromIntRect(pages_[page]);
 }
 
@@ skipping 44 matching lines @@
   return password_listeners_.get(input_element);
 }
 
 void WebFrameImpl::ClearPasswordListeners() {
   for (PasswordListenerMap::iterator iter = password_listeners_.begin();
        iter != password_listeners_.end(); ++iter) {
     delete iter->second;
   }
   password_listeners_.clear();
 }