Finish removing GrContext param from onRefEncodedData
TBR=reed@roogle.com
Bug: skia:5485
Change-Id: Ia4ed45ffc39f2ba9a80d4a1001208079142ae985
Reviewed-on: https://skia-review.googlesource.com/14323
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Matt Sarett <msarett@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
diff --git a/src/codec/SkCodecImageGenerator.cpp b/src/codec/SkCodecImageGenerator.cpp
index d1bb43f..d778bc7 100644
--- a/src/codec/SkCodecImageGenerator.cpp
+++ b/src/codec/SkCodecImageGenerator.cpp
@@ -31,11 +31,7 @@
, fData(std::move(data))
{}
-SkData* SkCodecImageGenerator::onRefEncodedData(
-#ifdef SK_SUPPORT_GPU_REF_ENCODED_DATA
- GrContext* ctx
-#endif
- ) {
+SkData* SkCodecImageGenerator::onRefEncodedData() {
return SkRef(fData.get());
}
diff --git a/src/codec/SkCodecImageGenerator.h b/src/codec/SkCodecImageGenerator.h
index 2332164..832a7f3 100644
--- a/src/codec/SkCodecImageGenerator.h
+++ b/src/codec/SkCodecImageGenerator.h
@@ -21,11 +21,7 @@
static std::unique_ptr<SkImageGenerator> MakeFromEncodedCodec(sk_sp<SkData>);
protected:
- SkData* onRefEncodedData(
-#ifdef SK_SUPPORT_GPU_REF_ENCODED_DATA
- GrContext* ctx
-#endif
- ) override;
+ SkData* onRefEncodedData() override;
bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, SkPMColor ctable[],
int* ctableCount) override;
diff --git a/src/core/SkImageGenerator.cpp b/src/core/SkImageGenerator.cpp
index 59619a9..6e71ce2 100644
--- a/src/core/SkImageGenerator.cpp
+++ b/src/core/SkImageGenerator.cpp
@@ -106,11 +106,7 @@
/////////////////////////////////////////////////////////////////////////////////////////////
-SkData* SkImageGenerator::onRefEncodedData(
-#ifdef SK_SUPPORT_GPU_REF_ENCODED_DATA
- GrContext* ctx
-#endif
- ) {
+SkData* SkImageGenerator::onRefEncodedData() {
return nullptr;
}
diff --git a/src/ports/SkImageGeneratorCG.cpp b/src/ports/SkImageGeneratorCG.cpp
index 7d1c44d..7aa1f28 100644
--- a/src/ports/SkImageGeneratorCG.cpp
+++ b/src/ports/SkImageGeneratorCG.cpp
@@ -75,11 +75,7 @@
, fData(SkRef(data))
{}
-SkData* SkImageGeneratorCG::onRefEncodedData(
-#ifdef SK_SUPPORT_GPU_REF_ENCODED_DATA
- GrContext* ctx
-#endif
- ) {
+SkData* SkImageGeneratorCG::onRefEncodedData() {
return SkRef(fData.get());
}
diff --git a/src/ports/SkImageGeneratorCG.h b/src/ports/SkImageGeneratorCG.h
index c675e85..2c20c5c 100644
--- a/src/ports/SkImageGeneratorCG.h
+++ b/src/ports/SkImageGeneratorCG.h
@@ -22,11 +22,7 @@
static SkImageGenerator* NewFromEncodedCG(SkData* data);
protected:
- SkData* onRefEncodedData(
-#ifdef SK_SUPPORT_GPU_REF_ENCODED_DATA
- GrContext* ctx
-#endif
- ) override;
+ SkData* onRefEncodedData() override;
bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, SkPMColor ctable[],
int* ctableCount) override;
diff --git a/src/ports/SkImageGeneratorWIC.cpp b/src/ports/SkImageGeneratorWIC.cpp
index 4195886..358d993e 100644
--- a/src/ports/SkImageGeneratorWIC.cpp
+++ b/src/ports/SkImageGeneratorWIC.cpp
@@ -132,11 +132,7 @@
, fData(SkRef(data))
{}
-SkData* SkImageGeneratorWIC::onRefEncodedData(
-#ifdef SK_SUPPORT_GPU_REF_ENCODED_DATA
- GrContext* ctx
-#endif
- ) {
+SkData* SkImageGeneratorWIC::onRefEncodedData() {
return SkRef(fData.get());
}
diff --git a/src/ports/SkImageGeneratorWIC.h b/src/ports/SkImageGeneratorWIC.h
index d20d493..0a5c9d3 100644
--- a/src/ports/SkImageGeneratorWIC.h
+++ b/src/ports/SkImageGeneratorWIC.h
@@ -39,11 +39,7 @@
static SkImageGenerator* NewFromEncodedWIC(SkData* data);
protected:
- SkData* onRefEncodedData(
-#ifdef SK_SUPPORT_GPU_REF_ENCODED_DATA
- GrContext* ctx
-#endif
- ) override;
+ SkData* onRefEncodedData() override;
bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, SkPMColor ctable[],
int* ctableCount) override;