| Index: webkit/tools/test_shell/webwidget_host_win.cc
|
| ===================================================================
|
| --- webkit/tools/test_shell/webwidget_host_win.cc (revision 85672)
|
| +++ webkit/tools/test_shell/webwidget_host_win.cc (working copy)
|
| @@ -251,13 +251,13 @@
|
| // Scroll the canvas if necessary
|
| scroll_rect_ = client_rect.Intersect(scroll_rect_);
|
| if (!scroll_rect_.IsEmpty()) {
|
| - HDC hdc = canvas_->beginPlatformPaint();
|
| + HDC hdc = skia::BeginPlatformPaint(canvas_.get());
|
|
|
| RECT damaged_rect, r = scroll_rect_.ToRECT();
|
| ScrollDC(hdc, scroll_dx_, scroll_dy_, NULL, &r, NULL, &damaged_rect);
|
|
|
| PaintRect(gfx::Rect(damaged_rect));
|
| - canvas_->endPlatformPaint();
|
| + skia::EndPlatformPaint(canvas_.get());
|
| }
|
| ResetScrollRect();
|
|
|
| @@ -279,10 +279,8 @@
|
| // Paint to the screen
|
| PAINTSTRUCT ps;
|
| BeginPaint(view_, &ps);
|
| - canvas_->getTopPlatformDevice().drawToHDC(ps.hdc,
|
| - ps.rcPaint.left,
|
| - ps.rcPaint.top,
|
| - &ps.rcPaint);
|
| + skia::DrawToNativeContext(&canvas_, ps.hdc, ps.rcPaint.left,
|
| + ps.rcPaint.top, &ps.rcPaint);
|
| EndPaint(view_, &ps);
|
|
|
| // Draw children
|
|
|