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

Unified Diff: views/widget/native_widget_win.cc

Issue 8122013: Allow CanvasSkia to bind to an existing SkCanvas. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: 1 more fix Created 9 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
Index: views/widget/native_widget_win.cc
diff --git a/views/widget/native_widget_win.cc b/views/widget/native_widget_win.cc
index 1afcb415b3385da5c65aa00bd830a673345eb37f..425f977c2ecfe66dbbe5b4020bbc47aa5f0864b9 100644
--- a/views/widget/native_widget_win.cc
+++ b/views/widget/native_widget_win.cc
@@ -2303,25 +2303,25 @@ void NativeWidgetWin::RedrawLayeredWindowContents() {
return;
// We need to clip to the dirty rect ourselves.
- layered_window_contents_->save(SkCanvas::kClip_SaveFlag);
+ layered_window_contents_->sk_canvas()->save(SkCanvas::kClip_SaveFlag);
layered_window_contents_->ClipRectInt(invalid_rect_.x(),
invalid_rect_.y(),
invalid_rect_.width(),
invalid_rect_.height());
GetWidget()->GetRootView()->Paint(layered_window_contents_.get());
- layered_window_contents_->restore();
+ layered_window_contents_->sk_canvas()->restore();
RECT wr;
GetWindowRect(&wr);
SIZE size = {wr.right - wr.left, wr.bottom - wr.top};
POINT position = {wr.left, wr.top};
- HDC dib_dc = skia::BeginPlatformPaint(layered_window_contents_.get());
+ HDC dib_dc = skia::BeginPlatformPaint(layered_window_contents_->sk_canvas());
POINT zero = {0, 0};
BLENDFUNCTION blend = {AC_SRC_OVER, 0, layered_alpha_, AC_SRC_ALPHA};
UpdateLayeredWindow(hwnd(), NULL, &position, &size, dib_dc, &zero,
RGB(0xFF, 0xFF, 0xFF), &blend, ULW_ALPHA);
invalid_rect_.SetRect(0, 0, 0, 0);
- skia::EndPlatformPaint(layered_window_contents_.get());
+ skia::EndPlatformPaint(layered_window_contents_->sk_canvas());
}
void NativeWidgetWin::LockUpdates() {
« ui/gfx/canvas.h ('K') | « views/view_unittest.cc ('k') | views/widget/root_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698