Commit 74c8b628 authored by fmalita@chromium.org's avatar fmalita@chromium.org

Switch to the new SkCanvas::willSave() API.

Skia's save() SaveFlags bits are going the way of the dodo. At this
point all callers have been updated to always pass kMatrixClip, but
SkCanvas subclasses also need to use the new willSave() API.

(depends on https://codereview.chromium.org/338833003/ rolling)

BUG=skia:2297
R=reed@google.com,senorblanco@chromium.org,malch@chromium.org

Review URL: https://codereview.chromium.org/338863002

git-svn-id: svn://svn.chromium.org/blink/trunk@176465 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent ba767df0
......@@ -4,7 +4,6 @@ Canvas log:
0 : {
method : "save"
params : {
saveFlags : "kMatrix_SaveFlag kClip_SaveFlag "
}
}
1 : {
......@@ -149,7 +148,6 @@ Canvas log:
4 : {
method : "save"
params : {
saveFlags : "kMatrix_SaveFlag kClip_SaveFlag "
}
}
5 : {
......@@ -175,7 +173,6 @@ Canvas log:
7 : {
method : "save"
params : {
saveFlags : "kMatrix_SaveFlag kClip_SaveFlag "
}
}
8 : {
......@@ -210,7 +207,7 @@ Canvas log:
textSize : 12
textSkewX : 0
}
saveFlags : "kMatrix_SaveFlag kClip_SaveFlag kHasAlphaLayer_SaveFlag kFullColorLayer_SaveFlag kClipToLayer_SaveFlag "
saveFlags : "kHasAlphaLayer_SaveFlag kFullColorLayer_SaveFlag kClipToLayer_SaveFlag "
}
}
}
......
......@@ -423,11 +423,10 @@ public:
return kNoLayer_SaveLayerStrategy;
}
void willSave(SaveFlags flags) OVERRIDE
void willSave() OVERRIDE
{
RefPtr<JSONObject> params = addItemWithParams("save");
params->setString("saveFlags", saveFlagsToString(flags));
this->SkCanvas::willSave(flags);
this->SkCanvas::willSave();
}
bool isClipEmpty() const OVERRIDE
......@@ -929,10 +928,6 @@ private:
String saveFlagsToString(SkCanvas::SaveFlags flags)
{
String flagsString = "";
if (flags & SkCanvas::kMatrix_SaveFlag)
flagsString.append("kMatrix_SaveFlag ");
if (flags & SkCanvas::kClip_SaveFlag)
flagsString.append("kClip_SaveFlag ");
if (flags & SkCanvas::kHasAlphaLayer_SaveFlag)
flagsString.append("kHasAlphaLayer_SaveFlag ");
if (flags & SkCanvas::kFullColorLayer_SaveFlag)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment