Replace webkit/glue/screen_info.h with WebKit/chromium/public/WebScreenInfo.h...

webkit/tools/test_shell/webwidget_host_win.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 "webkit/tools/test_shell/webwidget_host.h"
 
 #include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/win_util.h"
 #include "skia/ext/platform_canvas.h"
 #include "skia/ext/platform_canvas_win.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h"
 #include "third_party/WebKit/WebKit/chromium/public/win/WebInputEventFactory.h"
+#include "third_party/WebKit/WebKit/chromium/public/win/WebScreenInfoFactory.h"
 #include "webkit/glue/webwidget.h"
 #include "webkit/tools/test_shell/test_shell.h"
 
 using WebKit::WebInputEvent;
 using WebKit::WebInputEventFactory;
 using WebKit::WebKeyboardEvent;
 using WebKit::WebMouseEvent;
 using WebKit::WebMouseWheelEvent;
+using WebKit::WebScreenInfo;
+using WebKit::WebScreenInfoFactory;
 
 static const wchar_t kWindowClassName[] = L"WebWidgetHost";
 
 /*static*/
 WebWidgetHost* WebWidgetHost::Create(HWND parent_view,
                                      WebWidgetDelegate* delegate) {
   WebWidgetHost* host = new WebWidgetHost();
 
   static bool registered_class = false;
   if (!registered_class) {
@@ skipping 234 matching lines @@
   canvas_->getTopPlatformDevice().drawToHDC(ps.hdc,
                                             ps.rcPaint.left,
                                             ps.rcPaint.top,
                                             &ps.rcPaint);
   EndPaint(view_, &ps);
 
   // Draw children
   UpdateWindow(view_);
 }
 
+WebScreenInfo WebWidgetHost::GetScreenInfo() {
+  return WebScreenInfoFactory::screenInfo(view_);
+}
+
 void WebWidgetHost::Resize(LPARAM lparam) {
   // Force an entire re-paint.  TODO(darin): Maybe reuse this memory buffer.
   DiscardBackingStore();
 
   webwidget_->Resize(gfx::Size(LOWORD(lparam), HIWORD(lparam)));
 }
 
 void WebWidgetHost::MouseEvent(UINT message, WPARAM wparam, LPARAM lparam) {
   const WebMouseEvent& event = WebInputEventFactory::mouseEvent(
       view_, message, wparam, lparam);
@@ skipping 69 matching lines @@
 void WebWidgetHost::PaintRect(const gfx::Rect& rect) {
 #ifndef NDEBUG
   DCHECK(!painting_);
 #endif
   DCHECK(canvas_.get());
 
   set_painting(true);
   webwidget_->Paint(canvas_.get(), rect);
   set_painting(false);
 }