summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/renderer/render_widget.cc2
-rw-r--r--chrome/renderer/render_widget.h2
-rw-r--r--webkit/glue/chrome_client_impl.cc2
-rw-r--r--webkit/glue/plugins/webplugin_delegate_impl.cc8
-rw-r--r--webkit/glue/plugins/webplugin_delegate_impl.h5
-rw-r--r--webkit/glue/webwidget_delegate.h2
-rw-r--r--webkit/glue/webwidget_impl.cc2
-rw-r--r--webkit/tools/test_shell/test_webview_delegate.cc2
-rw-r--r--webkit/tools/test_shell/test_webview_delegate.h2
-rw-r--r--webkit/tools/test_shell/test_webview_delegate_win.cc2
10 files changed, 15 insertions, 14 deletions
diff --git a/chrome/renderer/render_widget.cc b/chrome/renderer/render_widget.cc
index c10b9e6..a213c83 100644
--- a/chrome/renderer/render_widget.cc
+++ b/chrome/renderer/render_widget.cc
@@ -504,7 +504,7 @@ void RenderWidget::DoDeferredScroll() {
///////////////////////////////////////////////////////////////////////////////
// WebWidgetDelegate
-HWND RenderWidget::GetContainingWindow(WebWidget* webwidget) {
+gfx::NativeView RenderWidget::GetContainingView(WebWidget* webwidget) {
return host_window_;
}
diff --git a/chrome/renderer/render_widget.h b/chrome/renderer/render_widget.h
index 8eefe47..dfdb825 100644
--- a/chrome/renderer/render_widget.h
+++ b/chrome/renderer/render_widget.h
@@ -64,7 +64,7 @@ class RenderWidget : public IPC::Channel::Listener,
bool InSend() const;
// WebWidgetDelegate
- virtual HWND GetContainingWindow(WebWidget* webwidget);
+ virtual gfx::NativeView GetContainingView(WebWidget* webwidget);
virtual void DidInvalidateRect(WebWidget* webwidget, const gfx::Rect& rect);
virtual void DidScrollRect(WebWidget* webwidget, int dx, int dy,
const gfx::Rect& clip_rect);
diff --git a/webkit/glue/chrome_client_impl.cc b/webkit/glue/chrome_client_impl.cc
index edb9ed7..860d9b1 100644
--- a/webkit/glue/chrome_client_impl.cc
+++ b/webkit/glue/chrome_client_impl.cc
@@ -409,7 +409,7 @@ WebCore::IntRect ChromeClientImpl::windowToScreen(
PlatformWidget ChromeClientImpl::platformWindow() const {
WebViewDelegate* d = webview_->delegate();
- return d ? d->GetContainingWindow(webview_) : NULL;
+ return d ? d->GetContainingView(webview_) : NULL;
}
void ChromeClientImpl::mouseDidMoveOverElement(
diff --git a/webkit/glue/plugins/webplugin_delegate_impl.cc b/webkit/glue/plugins/webplugin_delegate_impl.cc
index 5d526f2..a48d7ed 100644
--- a/webkit/glue/plugins/webplugin_delegate_impl.cc
+++ b/webkit/glue/plugins/webplugin_delegate_impl.cc
@@ -53,7 +53,7 @@ iat_patch::IATPatchFunction WebPluginDelegateImpl::iat_patch_helper_;
WebPluginDelegateImpl* WebPluginDelegateImpl::Create(
const std::wstring& filename,
const std::string& mime_type,
- HWND containing_window) {
+ gfx::NativeView containing_view) {
scoped_refptr<NPAPI::PluginLib> plugin =
NPAPI::PluginLib::CreatePluginLib(filename);
if (plugin.get() == NULL)
@@ -65,7 +65,7 @@ WebPluginDelegateImpl* WebPluginDelegateImpl::Create(
scoped_refptr<NPAPI::PluginInstance> instance =
plugin->CreateInstance(mime_type);
- return new WebPluginDelegateImpl(containing_window, instance.get());
+ return new WebPluginDelegateImpl(containing_view, instance.get());
}
bool WebPluginDelegateImpl::IsPluginDelegateWindow(HWND window) {
@@ -120,9 +120,9 @@ LRESULT CALLBACK WebPluginDelegateImpl::HandleEventMessageFilterHook(
}
WebPluginDelegateImpl::WebPluginDelegateImpl(
- HWND containing_window,
+ gfx::NativeView containing_view,
NPAPI::PluginInstance *instance)
- : parent_(containing_window),
+ : parent_(containing_view),
instance_(instance),
quirks_(0),
plugin_(NULL),
diff --git a/webkit/glue/plugins/webplugin_delegate_impl.h b/webkit/glue/plugins/webplugin_delegate_impl.h
index 0bd16e5..db3d8f3 100644
--- a/webkit/glue/plugins/webplugin_delegate_impl.h
+++ b/webkit/glue/plugins/webplugin_delegate_impl.h
@@ -8,6 +8,7 @@
#include <string>
#include <list>
+#include "base/gfx/native_widget_types.h"
#include "base/iat_patch.h"
#include "base/ref_counted.h"
#include "base/task.h"
@@ -25,7 +26,7 @@ class WebPluginDelegateImpl : public WebPluginDelegate {
public:
static WebPluginDelegateImpl* Create(const std::wstring& filename,
const std::string& mime_type,
- HWND containing_window);
+ gfx::NativeView containing_view);
static bool IsPluginDelegateWindow(HWND window);
static bool GetPluginNameFromWindow(HWND window, std::wstring *plugin_name);
@@ -102,7 +103,7 @@ class WebPluginDelegateImpl : public WebPluginDelegate {
bool visible);
private:
- WebPluginDelegateImpl(HWND containing_window,
+ WebPluginDelegateImpl(gfx::NativeView containing_view,
NPAPI::PluginInstance *instance);
~WebPluginDelegateImpl();
diff --git a/webkit/glue/webwidget_delegate.h b/webkit/glue/webwidget_delegate.h
index 445cb92..cd84041 100644
--- a/webkit/glue/webwidget_delegate.h
+++ b/webkit/glue/webwidget_delegate.h
@@ -20,7 +20,7 @@ struct WebPluginGeometry;
class WebWidgetDelegate {
public:
// Returns the view in which the WebWidget is embedded.
- virtual gfx::NativeView GetContainingWindow(WebWidget* webwidget) = 0;
+ virtual gfx::NativeView GetContainingView(WebWidget* webwidget) = 0;
// Called when a region of the WebWidget needs to be re-painted.
virtual void DidInvalidateRect(WebWidget* webwidget, const gfx::Rect& rect) = 0;
diff --git a/webkit/glue/webwidget_impl.cc b/webkit/glue/webwidget_impl.cc
index 55f6d7c..4fe1d1b 100644
--- a/webkit/glue/webwidget_impl.cc
+++ b/webkit/glue/webwidget_impl.cc
@@ -239,7 +239,7 @@ WebCore::IntRect WebWidgetImpl::windowToScreen(
PlatformWidget WebWidgetImpl::platformWindow() const {
if (!delegate_)
return NULL;
- return delegate_->GetContainingWindow(const_cast<WebWidgetImpl*>(this));
+ return delegate_->GetContainingView(const_cast<WebWidgetImpl*>(this));
}
//-----------------------------------------------------------------------------
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index cc56330..8bad166 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -663,7 +663,7 @@ void TestWebViewDelegate::SetUserStyleSheetLocation(const GURL& location) {
// WebWidgetDelegate ---------------------------------------------------------
-gfx::NativeView TestWebViewDelegate::GetContainingWindow(WebWidget* webwidget) {
+gfx::NativeView TestWebViewDelegate::GetContainingView(WebWidget* webwidget) {
if (WebWidgetHost* host = GetHostForWidget(webwidget))
return host->view_handle();
diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h
index c559b1e..5c05e34 100644
--- a/webkit/tools/test_shell/test_webview_delegate.h
+++ b/webkit/tools/test_shell/test_webview_delegate.h
@@ -206,7 +206,7 @@ class TestWebViewDelegate : public base::RefCounted<TestWebViewDelegate>,
virtual int GetHistoryForwardListCount();
// WebWidgetDelegate
- virtual gfx::NativeView GetContainingWindow(WebWidget* webwidget);
+ virtual gfx::NativeView GetContainingView(WebWidget* webwidget);
virtual void DidInvalidateRect(WebWidget* webwidget, const gfx::Rect& rect);
virtual void DidScrollRect(WebWidget* webwidget, int dx, int dy,
const gfx::Rect& clip_rect);
diff --git a/webkit/tools/test_shell/test_webview_delegate_win.cc b/webkit/tools/test_shell/test_webview_delegate_win.cc
index 64b1e17..cea089a 100644
--- a/webkit/tools/test_shell/test_webview_delegate_win.cc
+++ b/webkit/tools/test_shell/test_webview_delegate_win.cc
@@ -47,7 +47,7 @@ WebPluginDelegate* TestWebViewDelegate::CreatePluginDelegate(
const std::string& mime_type,
const std::string& clsid,
std::string* actual_mime_type) {
- HWND hwnd = GetContainingWindow(webview);
+ HWND hwnd = GetContainingView(webview);
if (!hwnd)
return NULL;
generated by cgit v1.1 at 2025-01-19 15:02:55 +0000