aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Florin Malita <fmalita@chromium.org>2018-02-20 11:26:15 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-02-20 17:08:53 +0000
commit97b3d2bcdb862b13a6a3f7a0b263bd04e2b8f911 (patch)
tree7e24a6a6c8dc301e303281f67504cbd8d9116043
parent2a552179cc20f4d198c9035106df226c36f5e8c9 (diff)
[sksg] Add 'plane' geometry node
SG geometry corresponding to SkCanvas::drawPaint(). TBR= Change-Id: I3b368adda187fb92f524756496a3694c03a3113d Reviewed-on: https://skia-review.googlesource.com/108562 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
-rw-r--r--BUILD.gn1
-rw-r--r--experimental/sksg/geometry/SkSGPlane.cpp36
-rw-r--r--experimental/sksg/geometry/SkSGPlane.h40
-rw-r--r--tools/viewer/SlideDir.cpp3
4 files changed, 79 insertions, 1 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 1c1fe38238..f50f7be1c4 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1401,6 +1401,7 @@ if (skia_enable_tools) {
"experimental/sksg/geometry/SkSGGeometryTransform.cpp",
"experimental/sksg/geometry/SkSGMerge.cpp",
"experimental/sksg/geometry/SkSGPath.cpp",
+ "experimental/sksg/geometry/SkSGPlane.cpp",
"experimental/sksg/geometry/SkSGRect.cpp",
"experimental/sksg/geometry/SkSGText.cpp",
"experimental/sksg/geometry/SkSGTrimEffect.cpp",
diff --git a/experimental/sksg/geometry/SkSGPlane.cpp b/experimental/sksg/geometry/SkSGPlane.cpp
new file mode 100644
index 0000000000..806fcc7d29
--- /dev/null
+++ b/experimental/sksg/geometry/SkSGPlane.cpp
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2018 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkSGPlane.h"
+
+#include "SkCanvas.h"
+#include "SkPath.h"
+
+namespace sksg {
+
+Plane::Plane() = default;
+
+void Plane::onClip(SkCanvas*, bool) const {}
+
+void Plane::onDraw(SkCanvas* canvas, const SkPaint& paint) const {
+ canvas->drawPaint(paint);
+}
+
+SkRect Plane::onRevalidate(InvalidationController*, const SkMatrix&) {
+ SkASSERT(this->hasInval());
+
+ return SkRect::MakeLTRB(SK_ScalarMin, SK_ScalarMin, SK_ScalarMax, SK_ScalarMax);
+}
+
+SkPath Plane::onAsPath() const {
+ SkPath path;
+ path.setFillType(SkPath::kInverseWinding_FillType);
+
+ return path;
+}
+
+} // namespace sksg
diff --git a/experimental/sksg/geometry/SkSGPlane.h b/experimental/sksg/geometry/SkSGPlane.h
new file mode 100644
index 0000000000..c0a26375b2
--- /dev/null
+++ b/experimental/sksg/geometry/SkSGPlane.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2018 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkSGPlane_DEFINED
+#define SkSGPlane_DEFINED
+
+#include "SkSGGeometryNode.h"
+
+class SkCanvas;
+class SkPaint;
+
+namespace sksg {
+
+/**
+ * Concrete Geometry node, representing the whole canvas.
+ */
+class Plane final : public GeometryNode {
+public:
+ static sk_sp<Plane> Make() { return sk_sp<Plane>(new Plane()); }
+
+protected:
+ void onClip(SkCanvas*, bool antiAlias) const override;
+ void onDraw(SkCanvas*, const SkPaint&) const override;
+
+ SkRect onRevalidate(InvalidationController*, const SkMatrix&) override;
+ SkPath onAsPath() const override;
+
+private:
+ Plane();
+
+ using INHERITED = GeometryNode;
+};
+
+} // namespace sksg
+
+#endif // SkSGPlane_DEFINED
diff --git a/tools/viewer/SlideDir.cpp b/tools/viewer/SlideDir.cpp
index a7fe77b263..ce036b4885 100644
--- a/tools/viewer/SlideDir.cpp
+++ b/tools/viewer/SlideDir.cpp
@@ -14,6 +14,7 @@
#include "SkSGColor.h"
#include "SkSGDraw.h"
#include "SkSGGroup.h"
+#include "SkSGPlane.h"
#include "SkSGRect.h"
#include "SkSGRenderNode.h"
#include "SkSGScene.h"
@@ -110,7 +111,7 @@ public:
fMap.setPts(kFocusCtrl1, kFocusCtrl0);
fShadePaint = sksg::Color::Make(kFocusShade);
- fShade = sksg::Draw::Make(sksg::Rect::Make(SkRect::MakeSize(dir->fWinSize)), fShadePaint);
+ fShade = sksg::Draw::Make(sksg::Plane::Make(), fShadePaint);
}
bool hasFocus() const { return fState == State::kFocused; }