| Index: content/browser/renderer_host/render_widget_host_view_win.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc
|
| index 961010dc78651c0c71c39116adc4c3c6a9f4edfd..2d6e3d2236afbe31ebeb3bba4fd93e4c581c9aec 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_win.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_win.cc
|
| @@ -777,8 +777,7 @@ void RenderWidgetHostViewWin::SelectionBoundsChanged(
|
| text_input_type_ != ui::TEXT_INPUT_TYPE_PASSWORD);
|
| // Only update caret position if the input method is enabled.
|
| if (is_enabled) {
|
| - caret_rect_ = start_rect;
|
| - caret_rect_.Union(end_rect);
|
| + caret_rect_ = gfx::Union(start_rect, end_rect);
|
| ime_input_.UpdateCaretRect(m_hWnd, caret_rect_);
|
| }
|
| }
|
| @@ -1364,8 +1363,8 @@ void RenderWidgetHostViewWin::OnPaint(HDC unused_dc) {
|
| }
|
|
|
| for (DWORD i = 0; i < region_data->rdh.nCount; ++i) {
|
| - gfx::Rect paint_rect = bitmap_rect;
|
| - paint_rect.Intersect(gfx::Rect(region_rects[i]));
|
| + gfx::Rect paint_rect =
|
| + gfx::Intersection(bitmap_rect, gfx::Rect(region_rects[i]));
|
| if (!paint_rect.IsEmpty()) {
|
| BitBlt(paint_dc.m_hDC,
|
| paint_rect.x(),
|
|
|