summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--content/renderer/skia_benchmarking_extension_unittest.cc2
-rw-r--r--skia/ext/analysis_canvas_unittest.cc4
-rw-r--r--ui/gfx/canvas_skia.cc4
-rw-r--r--ui/views/win/hwnd_message_handler.cc2
4 files changed, 6 insertions, 6 deletions
diff --git a/content/renderer/skia_benchmarking_extension_unittest.cc b/content/renderer/skia_benchmarking_extension_unittest.cc
index c9f4e90..b21c973 100644
--- a/content/renderer/skia_benchmarking_extension_unittest.cc
+++ b/content/renderer/skia_benchmarking_extension_unittest.cc
@@ -50,7 +50,7 @@ TEST(SkiaBenchmarkingExtensionTest, SkDebugCanvas) {
SkIntToScalar(50), SkIntToScalar(50));
// Draw a trivial scene.
- canvas.save(SkCanvas::kMatrixClip_SaveFlag);
+ canvas.save();
canvas.clipRect(fullRect, SkRegion::kIntersect_Op, false);
canvas.translate(SkIntToScalar(10), SkIntToScalar(10));
canvas.scale(SkIntToScalar(2), SkIntToScalar(2));
diff --git a/skia/ext/analysis_canvas_unittest.cc b/skia/ext/analysis_canvas_unittest.cc
index bc74053..2b668c5 100644
--- a/skia/ext/analysis_canvas_unittest.cc
+++ b/skia/ext/analysis_canvas_unittest.cc
@@ -235,7 +235,7 @@ TEST(AnalysisCanvasTest, SaveLayerRestore) {
paint.setXfermodeMode(SkXfermode::kSrcOver_Mode);
// This should force non-transparency
- canvas.saveLayer(&bounds, &paint, SkCanvas::kMatrix_SaveFlag);
+ canvas.saveLayer(&bounds, &paint);
EXPECT_TRUE(canvas.GetColorIfSolid(&outputColor));
EXPECT_NE(static_cast<SkColor>(SK_ColorTRANSPARENT), outputColor);
@@ -249,7 +249,7 @@ TEST(AnalysisCanvasTest, SaveLayerRestore) {
paint.setXfermodeMode(SkXfermode::kDst_Mode);
// This should force non-solid color
- canvas.saveLayer(&bounds, &paint, SkCanvas::kMatrix_SaveFlag);
+ canvas.saveLayer(&bounds, &paint);
EXPECT_FALSE(canvas.GetColorIfSolid(&outputColor));
TransparentFill(canvas);
diff --git a/ui/gfx/canvas_skia.cc b/ui/gfx/canvas_skia.cc
index 1ad60ba..fe6dcca 100644
--- a/ui/gfx/canvas_skia.cc
+++ b/ui/gfx/canvas_skia.cc
@@ -230,7 +230,7 @@ void Canvas::DrawStringRectWithShadows(const base::string16& text,
Rect clip_rect(text_bounds);
clip_rect.Inset(ShadowValue::GetMargin(shadows));
- canvas_->save(SkCanvas::kClip_SaveFlag);
+ canvas_->save();
ClipRect(clip_rect);
Rect rect(text_bounds);
@@ -424,7 +424,7 @@ void Canvas::DrawFadeTruncatingStringRectWithFlags(
rect.set_height(line_height);
render_text->SetDisplayRect(rect);
- canvas_->save(SkCanvas::kClip_SaveFlag);
+ canvas_->save();
ClipRect(display_rect);
render_text->Draw(this);
canvas_->restore();
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
index 41b7820..92c8512 100644
--- a/ui/views/win/hwnd_message_handler.cc
+++ b/ui/views/win/hwnd_message_handler.cc
@@ -1194,7 +1194,7 @@ void HWNDMessageHandler::RedrawLayeredWindowContents() {
return;
// We need to clip to the dirty rect ourselves.
- layered_window_contents_->sk_canvas()->save(SkCanvas::kClip_SaveFlag);
+ layered_window_contents_->sk_canvas()->save();
double scale = gfx::win::GetDeviceScaleFactor();
layered_window_contents_->sk_canvas()->scale(
SkScalar(scale),SkScalar(scale));