7bf799956d
This is a reland of e58831cd95
Original change's description:
> Add format-specifier warnings to SkDebugf.
>
> This CL fixes up many existing format-specifier violations in Skia.
> Note that GCC has a warning for formatting nothing, so existing calls to
> `SkDebugf("")` have been removed, or replaced with `SkDebugf("%s", "")`.
> These were apparently meant to be used as a place to set a breakpoint.
>
> Some of our clients also use SkDebug with bad format specifiers, so this
> check is currently only enabled when SKIA_IMPLEMENTATION is true.
>
> Change-Id: I8177a1298a624c6936adc24e0d8f481362a356d0
> Bug: skia:12143
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/420902
> Auto-Submit: John Stiles <johnstiles@google.com>
> Commit-Queue: Brian Osman <brianosman@google.com>
> Reviewed-by: Brian Osman <brianosman@google.com>
Bug: skia:12143
Change-Id: Id3c0c21436ebd13899908d5ed5d44c42a0e23921
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/421918
Commit-Queue: John Stiles <johnstiles@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
73 lines
1.7 KiB
C++
73 lines
1.7 KiB
C++
/*
|
|
* Copyright 2016 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "include/core/SkTypes.h"
|
|
|
|
#ifdef SK_XML
|
|
|
|
#include "include/core/SkCanvas.h"
|
|
#include "include/core/SkStream.h"
|
|
#include "modules/svg/include/SkSVGDOM.h"
|
|
#include "samplecode/Sample.h"
|
|
#include "src/core/SkOSFile.h"
|
|
#include "src/utils/SkOSPath.h"
|
|
#include "src/xml/SkDOM.h"
|
|
|
|
namespace {
|
|
|
|
class SVGFileView : public Sample {
|
|
public:
|
|
SVGFileView(const SkString& path)
|
|
: fPath(path), fLabel(SkStringPrintf("[%s]", SkOSPath::Basename(path.c_str()).c_str())) {}
|
|
~SVGFileView() override = default;
|
|
|
|
protected:
|
|
void onOnceBeforeDraw() override {
|
|
SkFILEStream svgStream(fPath.c_str());
|
|
if (!svgStream.isValid()) {
|
|
SkDebugf("file not found: \"%s\"\n", fPath.c_str());
|
|
return;
|
|
}
|
|
|
|
fDom = SkSVGDOM::MakeFromStream(svgStream);
|
|
if (fDom) {
|
|
fDom->setContainerSize(SkSize::Make(this->width(), this->height()));
|
|
}
|
|
}
|
|
|
|
void onDrawContent(SkCanvas* canvas) override {
|
|
if (fDom) {
|
|
fDom->render(canvas);
|
|
}
|
|
}
|
|
|
|
void onSizeChange() override {
|
|
if (fDom) {
|
|
fDom->setContainerSize(SkSize::Make(this->width(), this->height()));
|
|
}
|
|
|
|
this->INHERITED::onSizeChange();
|
|
}
|
|
|
|
SkString name() override { return fLabel; }
|
|
|
|
private:
|
|
sk_sp<SkSVGDOM> fDom;
|
|
SkString fPath;
|
|
SkString fLabel;
|
|
|
|
using INHERITED = Sample;
|
|
};
|
|
|
|
} // anonymous namespace
|
|
|
|
Sample* CreateSampleSVGFileView(const SkString& filename);
|
|
Sample* CreateSampleSVGFileView(const SkString& filename) {
|
|
return new SVGFileView(filename);
|
|
}
|
|
#endif // SK_XML
|