Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(203)

Side by Side Diff: webkit/plugins/webview_plugin.cc

Issue 11110004: Make gfx::Rect class operations consistently mutate the class they are called on. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: cc/ fixes Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 113
114 NPObject* WebViewPlugin::scriptableObject() { 114 NPObject* WebViewPlugin::scriptableObject() {
115 return NULL; 115 return NULL;
116 } 116 }
117 117
118 bool WebViewPlugin::getFormValue(WebString& value) { 118 bool WebViewPlugin::getFormValue(WebString& value) {
119 return false; 119 return false;
120 } 120 }
121 121
122 void WebViewPlugin::paint(WebCanvas* canvas, const WebRect& rect) { 122 void WebViewPlugin::paint(WebCanvas* canvas, const WebRect& rect) {
123 gfx::Rect paintRect(rect_.Intersect(rect)); 123 gfx::Rect paintRect = rect_;
124 paintRect.Intersect(rect);
124 if (paintRect.IsEmpty()) 125 if (paintRect.IsEmpty())
125 return; 126 return;
126 127
127 paintRect.Offset(-rect_.x(), -rect_.y()); 128 paintRect.Offset(-rect_.x(), -rect_.y());
128 129
129 canvas->translate(SkIntToScalar(rect_.x()), SkIntToScalar(rect_.y())); 130 canvas->translate(SkIntToScalar(rect_.x()), SkIntToScalar(rect_.y()));
130 canvas->save(); 131 canvas->save();
131 132
132 web_view_->layout(); 133 web_view_->layout();
133 web_view_->paint(canvas, paintRect); 134 web_view_->paint(canvas, paintRect);
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 return error; 234 return error;
234 } 235 }
235 236
236 void WebViewPlugin::didReceiveResponse(WebFrame* frame, 237 void WebViewPlugin::didReceiveResponse(WebFrame* frame,
237 unsigned identifier, 238 unsigned identifier,
238 const WebURLResponse& response) { 239 const WebURLResponse& response) {
239 WebFrameClient::didReceiveResponse(frame, identifier, response); 240 WebFrameClient::didReceiveResponse(frame, identifier, response);
240 } 241 }
241 242
242 } // namespace webkit 243 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/plugins/ppapi/ppb_scrollbar_impl.cc ('k') | webkit/tools/test_shell/webwidget_host_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698