AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SK_SUPPORT_LEGACY_DOCUMENT_FACTORY: clean up part 2/2

Browse Source 
Change-Id: Ibab2f420c779e0307f4df214f229609b377acf29
Reviewed-on: https://skia-review.googlesource.com/c/156369
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
This commit is contained in:
Hal Canary 2018-09-24 12:36:08 -04:00 committed by Skia Commit-Bot
parent ae16b74365
commit d18d7bd294
4 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gn/gn_to_bp.py
View File

@ -222,8 +222,6 @@ gn_args = {
} }
extra_userconfig_defines = [ extra_userconfig_defines = [
# remove once we've fixed call-sites
'SK_SUPPORT_LEGACY_DOCUMENT_FACTORY',
] ]
js = gn_to_bp_utils.GenerateJSONFromGN(gn_args) js = gn_to_bp_utils.GenerateJSONFromGN(gn_args)

5
include/core/SkDocument.h
View File

@ -10,8 +10,6 @@
#include "SkRefCnt.h" #include "SkRefCnt.h"
#include "SkScalar.h" #include "SkScalar.h"
#include "SkString.h"
#include "SkTime.h"
class SkCanvas; class SkCanvas;
class SkWStream; class SkWStream;
@ -32,9 +30,6 @@ static constexpr SkScalar SK_ScalarDefaultRasterDPI = 72.0f;
*/ */
class SK_API SkDocument : public SkRefCnt { class SK_API SkDocument : public SkRefCnt {
public: public:
#ifdef SK_SUPPORT_LEGACY_DOCUMENT_FACTORY
static sk_sp<SkDocument> MakePDF(SkWStream* stream);
#endif // SK_SUPPORT_LEGACY_DOCUMENT_FACTORY
/** /**
* Begin a new page for the document, returning the canvas that will draw * Begin a new page for the document, returning the canvas that will draw

6
src/pdf/SkDocument_PDF_None.cpp
View File

@ -8,12 +8,6 @@
#include "SkCanvas.h" #include "SkCanvas.h"
#include "SkPDFDocument.h" #include "SkPDFDocument.h"
#ifdef SK_SUPPORT_LEGACY_DOCUMENT_FACTORY
sk_sp<SkDocument> SkDocument::MakePDF(SkWStream* stream) {
return nullptr;
}
#endif // SK_SUPPORT_LEGACY_DOCUMENT_FACTORY
sk_sp<SkDocument> SkPDF::MakeDocument(SkWStream*, const SkPDF::Metadata&) { return nullptr; } sk_sp<SkDocument> SkPDF::MakeDocument(SkWStream*, const SkPDF::Metadata&) { return nullptr; }
void SkPDF::SetNodeId(SkCanvas* c, int n) { void SkPDF::SetNodeId(SkCanvas* c, int n) {

5
src/pdf/SkPDFDocument.cpp
View File

@ -568,8 +568,3 @@ sk_sp<SkDocument> SkPDF::MakeDocument(SkWStream* stream, const SkPDF::Metadata&
return stream ? sk_make_sp<SkPDFDocument>(stream, std::move(meta)) : nullptr; return stream ? sk_make_sp<SkPDFDocument>(stream, std::move(meta)) : nullptr;
} }
#ifdef SK_SUPPORT_LEGACY_DOCUMENT_FACTORY
sk_sp<SkDocument> SkDocument::MakePDF(SkWStream* stream) {
return SkPDF::MakeDocument(stream, SkPDF::Metadata());
}
#endif // SK_SUPPORT_LEGACY_DOCUMENT_FACTORY