OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "webkit/plugins/webview_plugin.h" | 5 #include "webkit/plugins/webview_plugin.h" |
6 | 6 |
7 #include "base/message_loop.h" | 7 #include "base/message_loop.h" |
8 #include "base/metrics/histogram.h" | 8 #include "base/metrics/histogram.h" |
9 #include "skia/ext/platform_canvas.h" | 9 #include "skia/ext/platform_canvas.h" |
10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" | 10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" |
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
132 web_view_->layout(); | 132 web_view_->layout(); |
133 web_view_->paint(canvas, paintRect); | 133 web_view_->paint(canvas, paintRect); |
134 | 134 |
135 canvas->restore(); | 135 canvas->restore(); |
136 } | 136 } |
137 | 137 |
138 // Coordinates are relative to the containing window. | 138 // Coordinates are relative to the containing window. |
139 void WebViewPlugin::updateGeometry( | 139 void WebViewPlugin::updateGeometry( |
140 const WebRect& frame_rect, const WebRect& clip_rect, | 140 const WebRect& frame_rect, const WebRect& clip_rect, |
141 const WebVector<WebRect>& cut_out_rects, bool is_visible) { | 141 const WebVector<WebRect>& cut_out_rects, bool is_visible) { |
142 if (frame_rect != rect_) { | 142 if (static_cast<gfx::Rect>(frame_rect) != rect_) { |
143 rect_ = frame_rect; | 143 rect_ = frame_rect; |
144 web_view_->resize(WebSize(frame_rect.width, frame_rect.height)); | 144 web_view_->resize(WebSize(frame_rect.width, frame_rect.height)); |
145 } | 145 } |
146 } | 146 } |
147 | 147 |
148 bool WebViewPlugin::acceptsInputEvents() { | 148 bool WebViewPlugin::acceptsInputEvents() { |
149 return true; | 149 return true; |
150 } | 150 } |
151 | 151 |
152 bool WebViewPlugin::handleInputEvent(const WebInputEvent& event, | 152 bool WebViewPlugin::handleInputEvent(const WebInputEvent& event, |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
233 return error; | 233 return error; |
234 } | 234 } |
235 | 235 |
236 void WebViewPlugin::didReceiveResponse(WebFrame* frame, | 236 void WebViewPlugin::didReceiveResponse(WebFrame* frame, |
237 unsigned identifier, | 237 unsigned identifier, |
238 const WebURLResponse& response) { | 238 const WebURLResponse& response) { |
239 WebFrameClient::didReceiveResponse(frame, identifier, response); | 239 WebFrameClient::didReceiveResponse(frame, identifier, response); |
240 } | 240 } |
241 | 241 |
242 } // namespace webkit | 242 } // namespace webkit |
OLD | NEW |