Remove SkCanvas::flush() and related code from RecordingCanvas
In http://review.skia.org/716476, Skia removed SkCanvas::flush() and SkCanvas::onFlush(). Flushing is handled externally in SkiaOpenGLPipeline::draw() so there's no need to record it in the DisplayListData. Change-Id: I04e71041841d9d9f60acce3fe299cd643d8ae8ea
This commit is contained in:
@@ -14,7 +14,6 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
X(Flush)
|
||||
X(Save)
|
||||
X(Restore)
|
||||
X(SaveLayer)
|
||||
|
||||
@@ -107,11 +107,6 @@ struct Op {
|
||||
};
|
||||
static_assert(sizeof(Op) == 4, "");
|
||||
|
||||
struct Flush final : Op {
|
||||
static const auto kType = Type::Flush;
|
||||
void draw(SkCanvas* c, const SkMatrix&) const { c->flush(); }
|
||||
};
|
||||
|
||||
struct Save final : Op {
|
||||
static const auto kType = Type::Save;
|
||||
void draw(SkCanvas* c, const SkMatrix&) const { c->save(); }
|
||||
@@ -751,10 +746,6 @@ inline void DisplayListData::map(const Fn fns[], Args... args) const {
|
||||
}
|
||||
}
|
||||
|
||||
void DisplayListData::flush() {
|
||||
this->push<Flush>(0);
|
||||
}
|
||||
|
||||
void DisplayListData::save() {
|
||||
this->push<Save>(0);
|
||||
}
|
||||
@@ -1046,10 +1037,6 @@ sk_sp<SkSurface> RecordingCanvas::onNewSurface(const SkImageInfo&, const SkSurfa
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
void RecordingCanvas::onFlush() {
|
||||
fDL->flush();
|
||||
}
|
||||
|
||||
void RecordingCanvas::willSave() {
|
||||
mSaveCount++;
|
||||
fDL->save();
|
||||
|
||||
@@ -127,8 +127,6 @@ public:
|
||||
private:
|
||||
friend class RecordingCanvas;
|
||||
|
||||
void flush();
|
||||
|
||||
void save();
|
||||
void saveLayer(const SkRect*, const SkPaint*, const SkImageFilter*, SkCanvas::SaveLayerFlags);
|
||||
void saveBehind(const SkRect*);
|
||||
@@ -208,8 +206,6 @@ public:
|
||||
void willRestore() override;
|
||||
bool onDoSaveBehind(const SkRect*) override;
|
||||
|
||||
void onFlush() override;
|
||||
|
||||
void didConcat44(const SkM44&) override;
|
||||
void didSetM44(const SkM44&) override;
|
||||
void didScale(SkScalar, SkScalar) override;
|
||||
|
||||
Reference in New Issue
Block a user