AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5933d4c8e5
skia2/include/utils/SkNWayCanvas.h

100 lines
4.3 KiB
C
Raw Normal View History

add -pict option to bench, which draws everything through a picture, and then compares the result to the original draws git-svn-id: http://skia.googlecode.com/svn/trunk@139 2bbb7eff-a529-9590-31e7-b0007b416f81
2009-03-31 03:48:49 +00:00
Automatic update of all copyright notices to reflect new license terms. I have manually examined all of these diffs and restored a few files that seem to require manual adjustment. The following files still need to be modified manually, in a separate CL: android_sample/SampleApp/AndroidManifest.xml android_sample/SampleApp/res/layout/layout.xml android_sample/SampleApp/res/menu/sample.xml android_sample/SampleApp/res/values/strings.xml android_sample/SampleApp/src/com/skia/sampleapp/SampleApp.java android_sample/SampleApp/src/com/skia/sampleapp/SampleView.java experimental/CiCarbonSampleMain.c experimental/CocoaDebugger/main.m experimental/FileReaderApp/main.m experimental/SimpleCocoaApp/main.m experimental/iOSSampleApp/Shared/SkAlertPrompt.h experimental/iOSSampleApp/Shared/SkAlertPrompt.m experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig gpu/src/android/GrGLDefaultInterface_android.cpp gyp/common.gypi gyp_skia include/ports/SkHarfBuzzFont.h include/views/SkOSWindow_wxwidgets.h make.bat make.py src/opts/memset.arm.S src/opts/memset16_neon.S src/opts/memset32_neon.S src/opts/opts_check_arm.cpp src/ports/SkDebug_brew.cpp src/ports/SkMemory_brew.cpp src/ports/SkOSFile_brew.cpp src/ports/SkXMLParser_empty.cpp src/utils/ios/SkImageDecoder_iOS.mm src/utils/ios/SkOSFile_iOS.mm src/utils/ios/SkStream_NSData.mm tests/FillPathTest.cpp Review URL: http://codereview.appspot.com/4816058 git-svn-id: http://skia.googlecode.com/svn/trunk@1982 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-28 14:26:00 +00:00
/*
* Copyright 2011 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
add -pict option to bench, which draws everything through a picture, and then compares the result to the original draws git-svn-id: http://skia.googlecode.com/svn/trunk@139 2bbb7eff-a529-9590-31e7-b0007b416f81
2009-03-31 03:48:49 +00:00
#ifndef SkNWayCanvas_DEFINED
#define SkNWayCanvas_DEFINED
rewrite includes to not need so much -Ifoo Current strategy: everything from the top Things to look at first are the manual changes: - added tools/rewrite_includes.py - removed -Idirectives from BUILD.gn - various compile.sh simplifications - tweak tools/embed_resources.py - update gn/find_headers.py to write paths from the top - update gn/gn_to_bp.py SkUserConfig.h layout so that #include "include/config/SkUserConfig.h" always gets the header we want. No-Presubmit: true Change-Id: I73a4b181654e0e38d229bc456c0d0854bae3363e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209706 Commit-Queue: Mike Klein <mtklein@google.com> Reviewed-by: Hal Canary <halcanary@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org>
2019-04-23 17:05:21 +00:00
#include "include/core/SkCanvasVirtualEnforcer.h"
#include "include/private/SkTDArray.h"
#include "include/utils/SkNoDrawCanvas.h"
add -pict option to bench, which draws everything through a picture, and then compares the result to the original draws git-svn-id: http://skia.googlecode.com/svn/trunk@139 2bbb7eff-a529-9590-31e7-b0007b416f81
2009-03-31 03:48:49 +00:00
Shim to enforce that canvas virtuals are overridden Change-Id: Iad70d449bbc43195baefd70d20c41996a8435e6e Reviewed-on: https://skia-review.googlesource.com/113320 Reviewed-by: Mike Reed <reed@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Brian Osman <brianosman@google.com>
2018-03-09 18:40:31 +00:00
class SK_API SkNWayCanvas : public SkCanvasVirtualEnforcer<SkNoDrawCanvas> {
add -pict option to bench, which draws everything through a picture, and then compares the result to the original draws git-svn-id: http://skia.googlecode.com/svn/trunk@139 2bbb7eff-a529-9590-31e7-b0007b416f81
2009-03-31 03:48:49 +00:00
public:
Add device to top level N-way canvas. Review URL: https://codereview.appspot.com/6131062 git-svn-id: http://skia.googlecode.com/svn/trunk@3811 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-01 16:50:25 +00:00
SkNWayCanvas(int width, int height);
Mark overridden destructors with 'override' and remove 'virtual' This silences a new warning in clang 5.0 Change-Id: Ieb5b75a6ffed60107c3fd16075d2ecfd515b55e8 Reviewed-on: https://skia-review.googlesource.com/10006 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Mike Klein <mtklein@chromium.org>
2017-03-22 16:05:03 +00:00
~SkNWayCanvas() override;
Formatting cleanup: remove extra whitespace Change by arthurhsu@chromium.org, original CL: http://codereview.appspot.com/5587049/ Review URL: https://codereview.appspot.com/5594043 git-svn-id: http://skia.googlecode.com/svn/trunk@3098 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-28 01:45:11 +00:00
Add SkCanvasStack and update the Canvas utilities to use it. BUG= R=reed@google.com Review URL: https://codereview.chromium.org/23865004 git-svn-id: http://skia.googlecode.com/svn/trunk@11081 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-09-04 17:16:00 +00:00
virtual void addCanvas(SkCanvas*);
virtual void removeCanvas(SkCanvas*);
virtual void removeAll();
add -pict option to bench, which draws everything through a picture, and then compares the result to the original draws git-svn-id: http://skia.googlecode.com/svn/trunk@139 2bbb7eff-a529-9590-31e7-b0007b416f81
2009-03-31 03:48:49 +00:00
Add SkCanvasStack and update the Canvas utilities to use it. BUG= R=reed@google.com Review URL: https://codereview.chromium.org/23865004 git-svn-id: http://skia.googlecode.com/svn/trunk@11081 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-09-04 17:16:00 +00:00
protected:
add -pict option to bench, which draws everything through a picture, and then compares the result to the original draws git-svn-id: http://skia.googlecode.com/svn/trunk@139 2bbb7eff-a529-9590-31e7-b0007b416f81
2009-03-31 03:48:49 +00:00
SkTDArray<SkCanvas*> fList;
Formatting cleanup: remove extra whitespace Change by arthurhsu@chromium.org, original CL: http://codereview.appspot.com/5587049/ Review URL: https://codereview.appspot.com/5594043 git-svn-id: http://skia.googlecode.com/svn/trunk@3098 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-28 01:45:11 +00:00
C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} NOPRESUBMIT=true BUG=skia: DOCS_PREVIEW= https://skia.org/?cl=1037793002 Review URL: https://codereview.chromium.org/1037793002
2015-03-26 01:17:31 +00:00
void willSave() override;
change signature for virtual related to saveLayer, passing SaveLayerRec BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1533953002 NOTREECHECKS=True Review URL: https://codereview.chromium.org/1533953002
2015-12-18 15:09:18 +00:00
SaveLayerStrategy getSaveLayerStrategy(const SaveLayerRec&) override;
add saveBehind to canvas Bug: skia: Change-Id: I62e48b116b2d7efef585d4f465441f24ae4d2b29 Reviewed-on: https://skia-review.googlesource.com/c/177892 Reviewed-by: Derek Sollenberger <djsollen@google.com> Commit-Queue: Mike Reed <reed@google.com>
2018-12-18 22:38:18 +00:00
bool onDoSaveBehind(const SkRect*) override;
C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} NOPRESUBMIT=true BUG=skia: DOCS_PREVIEW= https://skia.org/?cl=1037793002 Review URL: https://codereview.chromium.org/1037793002
2015-03-26 01:17:31 +00:00
void willRestore() override;
De-virtualize SkCanvas save/restore. This moves the state management logic into non-virtual SkCanvas methods, and turns the virtuals into protected notifiers. R=reed@google.com, robertphillips@google.com Author: fmalita@chromium.org Review URL: https://codereview.chromium.org/194713008 git-svn-id: http://skia.googlecode.com/svn/trunk@13776 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-03-12 20:21:48 +00:00
Change Marker IDs to be strings They are hashed to uint32_t at the API boundary (SkCanvas, SkVertices), but making them functionally strings will make the SkSL interaction much nicer. Change-Id: I0979871bf3d21373812129eb7e994987b3030e00 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/285664 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2020-04-24 16:02:25 +00:00
void onMarkCTM(const char*) override;
stage changing didCocnat44 virtual SK_SUPPORT_LEGACY_DIDCONCAT44 Change-Id: Ie208c245d7121fddc693a7d3c5d6866441c27433 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/281864 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Mike Reed <reed@google.com>
2020-04-07 01:32:43 +00:00
void didConcat44(const SkM44&) override;
Switch to m44 for the rest of canvas virtuals Guard flag has been added to clients Change-Id: Ib61a48781f5dbd52279c8f4257ba3e22fb2704e0 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/338596 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
2020-11-25 18:37:30 +00:00
void didSetM44(const SkM44&) override;
Override didTranslate, and add virtual for didScale This completes pushing through the new virtual didConcat44() to our subclasses, and introduces didScale() for future optimizations. We don't call didScale yet, until external subclasses are also updated. This was derived from https://skia-review.googlesource.com/c/skia/+/263349 bug: skia: 9768 Change-Id: Ia26b48e76e323037082e8f2ee83673c26b99ebed Reviewed-on: https://skia-review.googlesource.com/c/skia/+/263702 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
2020-01-10 22:21:40 +00:00
void didScale(SkScalar, SkScalar) override;
void didTranslate(SkScalar, SkScalar) override;
De-virtualize SkCanvas matrix ops. This moves the matrix management logic into non-virtual SkCanvas methods, and turns the virtuals into protected notifiers. R=reed@google.com, robertphillips@google.com, bsalomon@google.com BUG=skia:2297 Author: fmalita@chromium.org Review URL: https://codereview.chromium.org/195793012 git-svn-id: http://skia.googlecode.com/svn/trunk@13799 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-03-13 20:03:58 +00:00
C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} NOPRESUBMIT=true BUG=skia: DOCS_PREVIEW= https://skia.org/?cl=1037793002 Review URL: https://codereview.chromium.org/1037793002
2015-03-26 01:17:31 +00:00
void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) override;
Enable ClangTidy flag modernize-use-override. https://clang.llvm.org/extra/clang-tidy/checks/modernize-use-override.html Adds override (introduced in C++11) to overridden virtual functions and removes virtual from those functions as it is not required. virtual on non base class implementations was used to help indicate to the user that a function was virtual. C++ compilers did not use the presence of this to signify an overridden function. Change-Id: If66d8919358f72a4035190caf8d7569268037a9a Reviewed-on: https://skia-review.googlesource.com/c/skia/+/310160 Commit-Queue: Mike Klein <mtklein@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Mike Klein <mtklein@google.com>
2020-08-14 02:58:04 +00:00
void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
const SkPaint& paint) override;
void onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],
const SkPoint texCoords[4], SkBlendMode, const SkPaint& paint) override;
C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} NOPRESUBMIT=true BUG=skia: DOCS_PREVIEW= https://skia.org/?cl=1037793002 Review URL: https://codereview.chromium.org/1037793002
2015-03-26 01:17:31 +00:00
void onDrawPaint(const SkPaint&) override;
Add secret draw-behind method This is a variant of drawPaint but is automatically clipped to the bounds of the most recent saveBehind buffer (axis-aligned bounds). No public exposure. Impl is pretty simple (its a variant of drawPaint) - find the most recent saveBehind device bounds - if there is none, draw nothing, else - temporarily intersect the device's clip with that bounds - drawPaint - restore the clip See https://buganizer.corp.google.com/issues/129117085 Change-Id: I7c532e63a80b118fb2416c572b8e0d2abf8cf59a Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209166 Commit-Queue: Mike Reed <reed@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2019-04-19 19:00:47 +00:00
void onDrawBehind(const SkPaint&) override;
C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} NOPRESUBMIT=true BUG=skia: DOCS_PREVIEW= https://skia.org/?cl=1037793002 Review URL: https://codereview.chromium.org/1037793002
2015-03-26 01:17:31 +00:00
void onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) override;
void onDrawRect(const SkRect&, const SkPaint&) override;
Fill in some missing virtuals from canvas subclasses Bug: skia: Change-Id: If7306fa6c5a1619952e1159e6ebca8f04b4d9c8e Reviewed-on: https://skia-review.googlesource.com/113262 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org>
2018-03-08 19:52:20 +00:00
void onDrawRegion(const SkRegion&, const SkPaint&) override;
C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} NOPRESUBMIT=true BUG=skia: DOCS_PREVIEW= https://skia.org/?cl=1037793002 Review URL: https://codereview.chromium.org/1037793002
2015-03-26 01:17:31 +00:00
void onDrawOval(const SkRect&, const SkPaint&) override;
Plumb drawArc to SkDevice. Plumbs the drawArc canvas method down to SkDevice without converting to a path. Plumbs through the various recording canvas classes. BUG=skia:5227 GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2257023003 Review-Url: https://codereview.chromium.org/2257023003
2016-08-19 18:25:19 +00:00
void onDrawArc(const SkRect&, SkScalar, SkScalar, bool, const SkPaint&) override;
C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} NOPRESUBMIT=true BUG=skia: DOCS_PREVIEW= https://skia.org/?cl=1037793002 Review URL: https://codereview.chromium.org/1037793002
2015-03-26 01:17:31 +00:00
void onDrawRRect(const SkRRect&, const SkPaint&) override;
void onDrawPath(const SkPath&, const SkPaint&) override;
Reland "Add new virts, hide old ones" This reverts commit 8f924ac0ce63806886b7297e8be554984a6e7ce5. Reason for revert: suppressions landed for fuchsia images to rebaseline Original change's description: > Revert "Add new virts, hide old ones" > > This reverts commit c56e2e5aa65dd129e5927224d2f6c1f82edff74e. > > Reason for revert: suspected of breaking chrome roll > > Original change's description: > > Add new virts, hide old ones > > > > Add virtuals for the draw methods that now take sampling/filtermode. > > > > drawImage > > drawImageRect > > drawImageLattice > > drawAtlas > > > > Add a flag that can remove the older virtuals, once each client has > > stopped overriding them. In that situation, the older public methods > > will simplify extract the sampling from the paint, and call the new > > public methods. > > > > Bug: skia:11105, skia:7650 > > Change-Id: I8b0029727295caa983e8148fc743a55cfbecd043 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/347022 > > Commit-Queue: Mike Reed <reed@google.com> > > Reviewed-by: Florin Malita <fmalita@chromium.org> > > Reviewed-by: Brian Salomon <bsalomon@google.com> > > TBR=bsalomon@google.com,fmalita@chromium.org,reed@google.com > > Change-Id: I0a90952c11a180d918126ea06a630f4a0bf9b49b > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:11105 > Bug: skia:7650 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/348194 > Reviewed-by: Derek Sollenberger <djsollen@google.com> > Commit-Queue: Derek Sollenberger <djsollen@google.com> TBR=djsollen@google.com,bsalomon@google.com,fmalita@chromium.org,reed@google.com # Not skipping CQ checks because this is a reland. Bug: skia:11105 Bug: skia:7650 Change-Id: Ia2b4537a2d330460b7554278d2c05075cf27162a Reviewed-on: https://skia-review.googlesource.com/c/skia/+/348876 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
2020-12-30 14:22:42 +00:00
#ifdef SK_SUPPORT_LEGACY_ONDRAWIMAGERECT
C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} NOPRESUBMIT=true BUG=skia: DOCS_PREVIEW= https://skia.org/?cl=1037793002 Review URL: https://codereview.chromium.org/1037793002
2015-03-26 01:17:31 +00:00
void onDrawImage(const SkImage*, SkScalar left, SkScalar top, const SkPaint*) override;
Revert of Revert of move remaining virtual draw methods to onDraw (patchset #1 id:1 of https://codereview.chromium.org/835913002/) Reason for revert: test to see if it wasn't this CL that broke chromeos Original issue's description: > Revert of move remaining virtual draw methods to onDraw (patchset #5 id:80001 of https://codereview.chromium.org/817723005/) > > Reason for revert: > did this cause chromeos heap corruption on skp? > > Original issue's description: > > move remaining virtual draw methods to onDraw > > > > BUG=skia: > > > > Committed: https://skia.googlesource.com/skia/+/2e0f7d53bba5438c9bf11ee5ccae2c301e348419 > > TBR=robertphillips@google.com,djsollen@google.com,bsalomon@google.com,mtklein@google.com > NOTREECHECKS=true > NOTRY=true > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/e87e383351e1547b21d96d02bcd0c3cbbe0837f1 TBR=robertphillips@google.com,djsollen@google.com,bsalomon@google.com,mtklein@google.com,reed@chromium.org NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/831253002
2015-01-05 15:49:08 +00:00
void onDrawImageRect(const SkImage*, const SkRect* src, const SkRect& dst,
remove all guards for changes to drawBitmapRect / drawImageRect BUG=skia: Review URL: https://codereview.chromium.org/1239193002
2015-07-28 14:35:14 +00:00
const SkPaint*, SrcRectConstraint) override;
Reland "Add new virts, hide old ones" This reverts commit 8f924ac0ce63806886b7297e8be554984a6e7ce5. Reason for revert: suppressions landed for fuchsia images to rebaseline Original change's description: > Revert "Add new virts, hide old ones" > > This reverts commit c56e2e5aa65dd129e5927224d2f6c1f82edff74e. > > Reason for revert: suspected of breaking chrome roll > > Original change's description: > > Add new virts, hide old ones > > > > Add virtuals for the draw methods that now take sampling/filtermode. > > > > drawImage > > drawImageRect > > drawImageLattice > > drawAtlas > > > > Add a flag that can remove the older virtuals, once each client has > > stopped overriding them. In that situation, the older public methods > > will simplify extract the sampling from the paint, and call the new > > public methods. > > > > Bug: skia:11105, skia:7650 > > Change-Id: I8b0029727295caa983e8148fc743a55cfbecd043 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/347022 > > Commit-Queue: Mike Reed <reed@google.com> > > Reviewed-by: Florin Malita <fmalita@chromium.org> > > Reviewed-by: Brian Salomon <bsalomon@google.com> > > TBR=bsalomon@google.com,fmalita@chromium.org,reed@google.com > > Change-Id: I0a90952c11a180d918126ea06a630f4a0bf9b49b > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:11105 > Bug: skia:7650 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/348194 > Reviewed-by: Derek Sollenberger <djsollen@google.com> > Commit-Queue: Derek Sollenberger <djsollen@google.com> TBR=djsollen@google.com,bsalomon@google.com,fmalita@chromium.org,reed@google.com # Not skipping CQ checks because this is a reland. Bug: skia:11105 Bug: skia:7650 Change-Id: Ia2b4537a2d330460b7554278d2c05075cf27162a Reviewed-on: https://skia-review.googlesource.com/c/skia/+/348876 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
2020-12-30 14:22:42 +00:00
void onDrawImageLattice(const SkImage*, const Lattice& lattice, const SkRect& dst,
const SkPaint*) override;
Fill in some missing virtuals from canvas subclasses Bug: skia: Change-Id: If7306fa6c5a1619952e1159e6ebca8f04b4d9c8e Reviewed-on: https://skia-review.googlesource.com/113262 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org>
2018-03-08 19:52:20 +00:00
void onDrawAtlas(const SkImage*, const SkRSXform[], const SkRect[], const SkColor[],
int, SkBlendMode, const SkRect*, const SkPaint*) override;
Reland "Add new virts, hide old ones" This reverts commit 8f924ac0ce63806886b7297e8be554984a6e7ce5. Reason for revert: suppressions landed for fuchsia images to rebaseline Original change's description: > Revert "Add new virts, hide old ones" > > This reverts commit c56e2e5aa65dd129e5927224d2f6c1f82edff74e. > > Reason for revert: suspected of breaking chrome roll > > Original change's description: > > Add new virts, hide old ones > > > > Add virtuals for the draw methods that now take sampling/filtermode. > > > > drawImage > > drawImageRect > > drawImageLattice > > drawAtlas > > > > Add a flag that can remove the older virtuals, once each client has > > stopped overriding them. In that situation, the older public methods > > will simplify extract the sampling from the paint, and call the new > > public methods. > > > > Bug: skia:11105, skia:7650 > > Change-Id: I8b0029727295caa983e8148fc743a55cfbecd043 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/347022 > > Commit-Queue: Mike Reed <reed@google.com> > > Reviewed-by: Florin Malita <fmalita@chromium.org> > > Reviewed-by: Brian Salomon <bsalomon@google.com> > > TBR=bsalomon@google.com,fmalita@chromium.org,reed@google.com > > Change-Id: I0a90952c11a180d918126ea06a630f4a0bf9b49b > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:11105 > Bug: skia:7650 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/348194 > Reviewed-by: Derek Sollenberger <djsollen@google.com> > Commit-Queue: Derek Sollenberger <djsollen@google.com> TBR=djsollen@google.com,bsalomon@google.com,fmalita@chromium.org,reed@google.com # Not skipping CQ checks because this is a reland. Bug: skia:11105 Bug: skia:7650 Change-Id: Ia2b4537a2d330460b7554278d2c05075cf27162a Reviewed-on: https://skia-review.googlesource.com/c/skia/+/348876 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
2020-12-30 14:22:42 +00:00
#endif
void onDrawImage2(const SkImage*, SkScalar, SkScalar, const SkSamplingOptions&,
const SkPaint*) override;
void onDrawImageRect2(const SkImage*, const SkRect&, const SkRect&, const SkSamplingOptions&,
const SkPaint*, SrcRectConstraint) override;
void onDrawImageLattice2(const SkImage*, const Lattice&, const SkRect&, SkFilterMode,
const SkPaint*) override;
void onDrawAtlas2(const SkImage*, const SkRSXform[], const SkRect[], const SkColor[], int,
SkBlendMode, const SkSamplingOptions&, const SkRect*, const SkPaint*) override;
void onDrawVerticesObject(const SkVertices*, SkBlendMode, const SkPaint&) override;
move shadows to device virtual This CL keeps the impl for each device backend in the utils file for simplicity (shared helpers). Future CLs may move into their respective impl as they become more specialized. Bug: skia: Change-Id: I97ce6cdcc5106ebf4c84778f943cc32d0b7613c1 Reviewed-on: https://skia-review.googlesource.com/15893 Reviewed-by: Mike Klein <mtklein@chromium.org> Commit-Queue: Mike Reed <reed@google.com>
2017-05-17 12:53:36 +00:00
void onDrawShadowRec(const SkPath&, const SkDrawShadowRec&) override;
Revert of Revert of move remaining virtual draw methods to onDraw (patchset #1 id:1 of https://codereview.chromium.org/835913002/) Reason for revert: test to see if it wasn't this CL that broke chromeos Original issue's description: > Revert of move remaining virtual draw methods to onDraw (patchset #5 id:80001 of https://codereview.chromium.org/817723005/) > > Reason for revert: > did this cause chromeos heap corruption on skp? > > Original issue's description: > > move remaining virtual draw methods to onDraw > > > > BUG=skia: > > > > Committed: https://skia.googlesource.com/skia/+/2e0f7d53bba5438c9bf11ee5ccae2c301e348419 > > TBR=robertphillips@google.com,djsollen@google.com,bsalomon@google.com,mtklein@google.com > NOTREECHECKS=true > NOTRY=true > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/e87e383351e1547b21d96d02bcd0c3cbbe0837f1 TBR=robertphillips@google.com,djsollen@google.com,bsalomon@google.com,mtklein@google.com,reed@chromium.org NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/831253002
2015-01-05 15:49:08 +00:00
Revert[2] "remove SK_SUPPORT_LEGACY_CLIP_REGIONOPS" This reverts commit a129dfef2aaab0b5995cdf1ab7b2cdd41c29cf72. BUG=skia: Change-Id: I717de6e5fcd4516aa684b014b1414b0f82ac2b91 Reviewed-on: https://skia-review.googlesource.com/5722 Commit-Queue: Mike Reed <reed@google.com> Reviewed-by: Derek Sollenberger <djsollen@google.com>
2016-12-09 14:00:50 +00:00
void onClipRect(const SkRect&, SkClipOp, ClipEdgeStyle) override;
void onClipRRect(const SkRRect&, SkClipOp, ClipEdgeStyle) override;
void onClipPath(const SkPath&, SkClipOp, ClipEdgeStyle) override;
clipShader -- raster implementation 1. pass shader+op down to device 2. bitmapdevice pass it down to rasterclip 3. rasterclip only ever stores at most one shader - if there is a ctm, fold that into (another) shader - if the op is difference, invert the sense of alpha - if there was a previous shader, compose with it 4. pass through to rasterpipelineblitter 5. it prepends the colorPipeline with the clipShader, and stashes its results in a buffer (fClipShaderBuffer) 6. in each blit, scale/lerp from the buffer before storing the result Change-Id: I07c7a8a20b9ae95cdcc9954237d115e63819f7c1 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/275798 Commit-Queue: Mike Reed <reed@google.com> Reviewed-by: Mike Klein <mtklein@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org>
2020-03-10 18:02:56 +00:00
void onClipShader(sk_sp<SkShader>, SkClipOp) override;
Revert[2] "remove SK_SUPPORT_LEGACY_CLIP_REGIONOPS" This reverts commit a129dfef2aaab0b5995cdf1ab7b2cdd41c29cf72. BUG=skia: Change-Id: I717de6e5fcd4516aa684b014b1414b0f82ac2b91 Reviewed-on: https://skia-review.googlesource.com/5722 Commit-Queue: Mike Reed <reed@google.com> Reviewed-by: Derek Sollenberger <djsollen@google.com>
2016-12-09 14:00:50 +00:00
void onClipRegion(const SkRegion&, SkClipOp) override;
add new onClip* methods to SkCanvas https://codereview.chromium.org/183453002/ git-svn-id: http://skia.googlecode.com/svn/trunk@13627 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-28 18:19:39 +00:00
C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} NOPRESUBMIT=true BUG=skia: DOCS_PREVIEW= https://skia.org/?cl=1037793002 Review URL: https://codereview.chromium.org/1037793002
2015-03-26 01:17:31 +00:00
void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override;
Add missing onDrawDrawable() overrides to utility canvases Change-Id: Ia5a7c523263e2c4744e0f3a743c6a4433760a4be Reviewed-on: https://skia-review.googlesource.com/49770 Reviewed-by: Stan Iliev <stani@google.com> Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2017-09-21 19:28:29 +00:00
void onDrawDrawable(SkDrawable*, const SkMatrix*) override;
Move annotations to canvas virtual (patchset #8 id:140001 of https://codereview.chromium.org/1744103002/ )" Need to land chrome change first https://codereview.chromium.org/1766723003/ BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1758023003 TBR= Review URL: https://codereview.chromium.org/1758023003
2016-03-05 00:36:20 +00:00
void onDrawAnnotation(const SkRect&, const char[], SkData*) override;
Alter SkCanvas::drawPicture (devirtualize, take const SkPicture, take pointer) R=reed@google.com, bsalomon@google.com, mtklein@google.com Author: robertphillips@google.com Review URL: https://codereview.chromium.org/313613004
2014-06-04 12:40:44 +00:00
Add Color4f variant for DrawEdgeAAQuad Bug: chromium:795132,chromium:985500 Change-Id: Idbb4d45b29d2c0d0fd54b05b807086ecf0b8cf26 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/237492 Reviewed-by: Brian Salomon <bsalomon@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Michael Ludwig <michaelludwig@google.com>
2019-08-27 19:25:49 +00:00
void onDrawEdgeAAQuad(const SkRect&, const SkPoint[4], QuadAAFlags, const SkColor4f&,
Reland "Reland "Update SkCanvas' experimental SkiaRenderer API"" This reverts commit 138a06d1b1cd035daf6b6a970c75126e94777822. Reason for revert: add explicit constructors to ImageSetEntry to account for the new arguments, matching SkiaRenderer's current initializer list. Also hardens SkPictureDrawback's deserialization code for drawEdgeAAImageSet and drawEdgeAAQuad from a fuzz that was found during the CL's brief lifespan. Original change's description: > Revert "Reland "Update SkCanvas' experimental SkiaRenderer API"" > > This reverts commit bd9d88a6e4d9730f3aa67227e5a1618180513a87. > > Reason for revert: Breaks SkiaRenderer on Android. Rendering is all corrupted, bisected to this change. > > Original change's description: > > Reland "Update SkCanvas' experimental SkiaRenderer API" > > > > This reverts commit 90791c202dd2d943565237bf511d929e8bd19951. > > > > Reason for revert: Jumped the gun, just need to update blacklist > > > > Original change's description: > > > Revert "Update SkCanvas' experimental SkiaRenderer API" > > > > > > This reverts commit 4bf964602ab8758f6e580aaaa69add4fb260c1a6. > > > > > > Reason for revert: vulkan dm crashes > > > > > > Original change's description: > > > > Update SkCanvas' experimental SkiaRenderer API > > > > > > > > This lifts the temporary functions in SkGpuDevice into SkCanvas and > > > > deprecates the older experimental_DrawImageSetV1 and > > > > experimental_DrawEdgeAARect. The new functions can handle paints and > > > > transform batching. Internally, SkCanvas routes the old functions to the > > > > new entry points and all device-level code is updated to handle the new > > > > API features. > > > > > > > > While touching all of the canvas/device/recording areas, the > > > > experimental functions are grouped in an "EdgeAA" cluster instead of being > > > > separated into the image category and the rectangle category. > > > > > > > > Bug: skia:8739 > > > > Change-Id: I67c2a724873040ad5dc3307ab5b2823ba1eac54b > > > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/190221 > > > > Commit-Queue: Michael Ludwig <michaelludwig@google.com> > > > > Reviewed-by: Brian Salomon <bsalomon@google.com> > > > > > > TBR=bsalomon@google.com,robertphillips@google.com,michaelludwig@google.com > > > > > > Change-Id: I87a5a258c5a1bd15e16389cdf91743772d6fa98a > > > No-Presubmit: true > > > No-Tree-Checks: true > > > No-Try: true > > > Bug: skia:8739 > > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/201226 > > > Reviewed-by: Michael Ludwig <michaelludwig@google.com> > > > Commit-Queue: Michael Ludwig <michaelludwig@google.com> > > > > TBR=bsalomon@google.com,robertphillips@google.com,michaelludwig@google.com > > > > Change-Id: I75e9b6cbf079a7739b69a7e208730a930621abf9 > > No-Presubmit: true > > No-Tree-Checks: true > > No-Try: true > > Bug: skia:8739 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/201229 > > Reviewed-by: Michael Ludwig <michaelludwig@google.com> > > Commit-Queue: Michael Ludwig <michaelludwig@google.com> > > Auto-Submit: Michael Ludwig <michaelludwig@google.com> > > TBR=bsalomon@google.com,robertphillips@google.com,michaelludwig@google.com > > Change-Id: Ib87ef9b8b8598c16a8a6915920adf0b5dffc644b > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:8739 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/201391 > Reviewed-by: Brian Salomon <bsalomon@google.com> > Commit-Queue: Brian Salomon <bsalomon@google.com> Bug: skia:8739, oss-fuzz:13794 Change-Id: Ibd7df4a398928c3170d16300bf3ade496125372c Reviewed-on: https://skia-review.googlesource.com/c/skia/+/201650 Commit-Queue: Michael Ludwig <michaelludwig@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2019-03-19 13:16:38 +00:00
SkBlendMode) override;
void onDrawEdgeAAImageSet(const ImageSetEntry[], int count, const SkPoint[], const SkMatrix[],
const SkPaint*, SrcRectConstraint) override;
Plumb more SkPaintFilterCanvas virtuals SkNWayCanvas cannot support virtuals which imply one-to-one proxying, but SkPaintFilterCanvas can (and should). Change-Id: If966aa4ec3fcc79e6355a82cc299fd1877e4cf53 Reviewed-on: https://skia-review.googlesource.com/58842 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2017-10-12 15:08:46 +00:00
void onFlush() override;
add -pict option to bench, which draws everything through a picture, and then compares the result to the original draws git-svn-id: http://skia.googlecode.com/svn/trunk@139 2bbb7eff-a529-9590-31e7-b0007b416f81
2009-03-31 03:48:49 +00:00
class Iter;
Add SkCanvasStack and update the Canvas utilities to use it. BUG= R=reed@google.com Review URL: https://codereview.chromium.org/23865004 git-svn-id: http://skia.googlecode.com/svn/trunk@11081 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-09-04 17:16:00 +00:00
private:
Replace 'typedef xxxxx INHERITED' with 'using INHERITED = xxxx;'. Mechanically updated via Xcode "Replace Regular Expression": typedef (.*) INHERITED; --> using INHERITED = $1; The ClangTidy approach generated an even larger CL which would have required a significant amount of hand-tweaking to be usable. Change-Id: I671dc9d9efdf6d60151325c8d4d13fad7e10a15b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/314999 Commit-Queue: Mike Klein <mtklein@google.com> Reviewed-by: Mike Klein <mtklein@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-09-03 02:42:33 +00:00
using INHERITED = SkCanvasVirtualEnforcer<SkNoDrawCanvas>;
add -pict option to bench, which draws everything through a picture, and then compares the result to the original draws git-svn-id: http://skia.googlecode.com/svn/trunk@139 2bbb7eff-a529-9590-31e7-b0007b416f81
2009-03-31 03:48:49 +00:00
};
#endif
Reference in New Issue Copy Permalink