content/plugin/webplugin_proxy.cc - Issue 11110004: Make gfx::Rect class operations consistently mutate the class they are called on.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/plugin/webplugin_proxy.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, 2 months 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/common/gpu/image_transport_surface.cc ('k') | content/renderer/browser_plugin/browser_plugin_backing_store.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/plugin/webplugin_proxy.cc

diff --git a/content/plugin/webplugin_proxy.cc b/content/plugin/webplugin_proxy.cc

index 364deed22a42aeb94046da445f4c9364e7bf9ef6..c74af5b0863a35cb624951946b5463f068fd09b2 100644

--- a/content/plugin/webplugin_proxy.cc

+++ b/content/plugin/webplugin_proxy.cc

@@ -176,11 +176,12 @@ void WebPluginProxy::InvalidateRect(const gfx::Rect& rect) {

// offscreen, so constrain invalidates to the plugin rect.

gfx::Rect plugin_rect = delegate_->GetRect();

plugin_rect.set_origin(gfx::Point(0, 0));

- const gfx::Rect invalidate_rect(rect.Intersect(plugin_rect));

+ plugin_rect.Intersect(rect);

+ const gfx::Rect invalidate_rect(plugin_rect);

#else

const gfx::Rect invalidate_rect(rect);

#endif

- damaged_rect_ = damaged_rect_.Union(invalidate_rect);

+ damaged_rect_.Union(invalidate_rect);

// Ignore NPN_InvalidateRect calls with empty rects. Also don't send an

// invalidate if it's outside the clipping region, since if we did it won't

// lead to a paint and we'll be stuck waiting forever for a DidPaint response.

« no previous file with comments | « content/common/gpu/image_transport_surface.cc ('k') | content/renderer/browser_plugin/browser_plugin_backing_store.cc » ('j') | no next file with comments »