| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <gtk/gtk.h> | 5 #include <gtk/gtk.h> |
| 6 | 6 |
| 7 #include "webkit/tools/test_shell/webview_host.h" | 7 #include "webkit/tools/test_shell/webview_host.h" |
| 8 | 8 |
| 9 #include "base/gfx/rect.h" | 9 #include "base/gfx/rect.h" |
| 10 #include "base/gfx/size.h" | 10 #include "base/gfx/size.h" |
| 11 #include "base/logging.h" | |
| 12 #include "skia/ext/platform_canvas.h" | 11 #include "skia/ext/platform_canvas.h" |
| 13 #include "webkit/glue/webinputevent.h" | 12 #include "webkit/glue/webinputevent.h" |
| 14 #include "webkit/glue/webview.h" | 13 #include "webkit/glue/webview.h" |
| 15 | 14 |
| 16 // static | 15 // static |
| 17 WebViewHost* WebViewHost::Create(GtkWidget* parent_view, | 16 WebViewHost* WebViewHost::Create(GtkWidget* parent_view, |
| 18 WebViewDelegate* delegate, | 17 WebViewDelegate* delegate, |
| 19 const WebPreferences& prefs) { | 18 const WebPreferences& prefs) { |
| 20 WebViewHost* host = new WebViewHost(); | 19 WebViewHost* host = new WebViewHost(); |
| 21 | 20 |
| 22 host->view_ = WebWidgetHost::CreateWidget(parent_view, host); | 21 host->view_ = WebWidgetHost::CreateWidget(parent_view, host); |
| 23 g_object_set_data(G_OBJECT(host->view_), "webwidgethost", host); | 22 g_object_set_data(G_OBJECT(host->view_), "webwidgethost", host); |
| 24 | 23 |
| 25 host->webwidget_ = WebView::Create(delegate, prefs); | 24 host->webwidget_ = WebView::Create(delegate, prefs); |
| 26 host->webwidget_->Layout(); | 25 host->webwidget_->Layout(); |
| 27 | 26 |
| 28 return host; | 27 return host; |
| 29 } | 28 } |
| 30 | 29 |
| 31 WebView* WebViewHost::webview() const { | 30 WebView* WebViewHost::webview() const { |
| 32 return static_cast<WebView*>(webwidget_); | 31 return static_cast<WebView*>(webwidget_); |
| 33 } | 32 } |
| OLD | NEW |