aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/core/SkStream.h8
-rw-r--r--src/pdf/SkPDFDevice.cpp6
-rw-r--r--src/utils/SkParsePath.cpp2
-rw-r--r--tests/PDFGlyphsToUnicodeTest.cpp10
-rw-r--r--tests/PDFOpaqueSrcModeToSrcOverTest.cpp4
-rw-r--r--tests/StreamTest.cpp8
6 files changed, 18 insertions, 20 deletions
diff --git a/include/core/SkStream.h b/include/core/SkStream.h
index e6df9eabde..83eee4708b 100644
--- a/include/core/SkStream.h
+++ b/include/core/SkStream.h
@@ -385,16 +385,14 @@ public:
bool write(const void* buffer, size_t size) override;
size_t bytesWritten() const override;
- bool read(void* buffer, size_t offset, size_t size);
- // Why do we have this as a separate method???
- size_t getOffset() const { return this->bytesWritten(); }
+ bool read(void* buffer, size_t offset, size_t size);
- // copy what has been written to the stream into dst
+ /** More efficient version of read(dst, 0, bytesWritten()). */
void copyTo(void* dst) const;
void writeToStream(SkWStream* dst) const;
- // Return the contents as SkData, and then reset the stream.
+ /** Return the contents as SkData, and then reset the stream. */
sk_sp<SkData> detachAsData();
/** Reset, returning a reader stream with the current content. */
diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp
index 005ce67abb..9ef3611142 100644
--- a/src/pdf/SkPDFDevice.cpp
+++ b/src/pdf/SkPDFDevice.cpp
@@ -1800,7 +1800,7 @@ SkPDFDevice::ContentEntry* SkPDFDevice::setUpContentEntry(const SkClipStack* cli
}
SkPDFDevice::ContentEntry* entry;
- if (fContentEntries.back() && fContentEntries.back()->fContent.getOffset() == 0) {
+ if (fContentEntries.back() && fContentEntries.back()->fContent.bytesWritten() == 0) {
entry = fContentEntries.back();
} else if (blendMode != SkBlendMode::kDstOver) {
entry = fContentEntries.emplace_back();
@@ -1830,7 +1830,7 @@ void SkPDFDevice::finishContentEntry(SkBlendMode blendMode,
}
if (blendMode == SkBlendMode::kDstOver) {
SkASSERT(!dst);
- if (fContentEntries.front()->fContent.getOffset() == 0) {
+ if (fContentEntries.front()->fContent.bytesWritten() == 0) {
// For DstOver, an empty content entry was inserted before the rest
// of the content entries. If nothing was drawn, it needs to be
// removed.
@@ -1974,7 +1974,7 @@ void SkPDFDevice::finishContentEntry(SkBlendMode blendMode,
}
bool SkPDFDevice::isContentEmpty() {
- if (!fContentEntries.front() || fContentEntries.front()->fContent.getOffset() == 0) {
+ if (!fContentEntries.front() || fContentEntries.front()->fContent.bytesWritten() == 0) {
SkASSERT(fContentEntries.count() <= 1);
return true;
}
diff --git a/src/utils/SkParsePath.cpp b/src/utils/SkParsePath.cpp
index c924661907..c5fed6cfca 100644
--- a/src/utils/SkParsePath.cpp
+++ b/src/utils/SkParsePath.cpp
@@ -261,7 +261,7 @@ void SkParsePath::ToSVGString(const SkPath& path, SkString* str) {
stream.write("Z", 1);
break;
case SkPath::kDone_Verb:
- str->resize(stream.getOffset());
+ str->resize(stream.bytesWritten());
stream.copyTo(str->writable_str());
return;
}
diff --git a/tests/PDFGlyphsToUnicodeTest.cpp b/tests/PDFGlyphsToUnicodeTest.cpp
index a256c93a8d..0d87cd7df2 100644
--- a/tests/PDFGlyphsToUnicodeTest.cpp
+++ b/tests/PDFGlyphsToUnicodeTest.cpp
@@ -90,7 +90,7 @@ endbfchar\n\
endbfrange\n";
REPORTER_ASSERT(reporter, stream_equals(buffer, 0, expectedResult,
- buffer.getOffset()));
+ buffer.bytesWritten()));
// Remove characters and ranges.
buffer.reset();
@@ -108,7 +108,7 @@ endbfchar\n\
endbfrange\n";
REPORTER_ASSERT(reporter, stream_equals(buffer, 0, expectedResultChop1,
- buffer.getOffset()));
+ buffer.bytesWritten()));
// Remove characters from range to downdrade it to one char.
buffer.reset();
@@ -122,7 +122,7 @@ endbfrange\n";
endbfchar\n";
REPORTER_ASSERT(reporter, stream_equals(buffer, 0, expectedResultChop2,
- buffer.getOffset()));
+ buffer.bytesWritten()));
buffer.reset();
@@ -139,7 +139,7 @@ endbfrange\n";
REPORTER_ASSERT(reporter, stream_equals(buffer, 0,
expectedResultSingleBytes,
- buffer.getOffset()));
+ buffer.bytesWritten()));
glyphToUnicode.reset();
glyphsInSubset.reset();
@@ -176,5 +176,5 @@ endbfchar\n\
endbfrange\n";
REPORTER_ASSERT(reporter, stream_equals(buffer2, 0, expectedResult2,
- buffer2.getOffset()));
+ buffer2.bytesWritten()));
}
diff --git a/tests/PDFOpaqueSrcModeToSrcOverTest.cpp b/tests/PDFOpaqueSrcModeToSrcOverTest.cpp
index e15234d090..8b3cfe0e1d 100644
--- a/tests/PDFOpaqueSrcModeToSrcOverTest.cpp
+++ b/tests/PDFOpaqueSrcModeToSrcOverTest.cpp
@@ -33,7 +33,7 @@ DEF_TEST(SkPDF_OpaqueSrcModeToSrcOver, r) {
U8CPU alpha = SK_AlphaOPAQUE;
run_test(&srcMode, SkBlendMode::kSrc, alpha);
run_test(&srcOverMode, SkBlendMode::kSrcOver, alpha);
- REPORTER_ASSERT(r, srcMode.getOffset() == srcOverMode.getOffset());
+ REPORTER_ASSERT(r, srcMode.bytesWritten() == srcOverMode.bytesWritten());
// The two PDFs should be equal because they have an opaque alpha.
srcMode.reset();
@@ -42,6 +42,6 @@ DEF_TEST(SkPDF_OpaqueSrcModeToSrcOver, r) {
alpha = 0x80;
run_test(&srcMode, SkBlendMode::kSrc, alpha);
run_test(&srcOverMode, SkBlendMode::kSrcOver, alpha);
- REPORTER_ASSERT(r, srcMode.getOffset() > srcOverMode.getOffset());
+ REPORTER_ASSERT(r, srcMode.bytesWritten() > srcOverMode.bytesWritten());
// The two PDFs should not be equal because they have a non-opaque alpha.
}
diff --git a/tests/StreamTest.cpp b/tests/StreamTest.cpp
index b64de6926f..4b8923f399 100644
--- a/tests/StreamTest.cpp
+++ b/tests/StreamTest.cpp
@@ -84,7 +84,7 @@ static void TestWStream(skiatest::Reporter* reporter) {
for (i = 0; i < 100; i++) {
REPORTER_ASSERT(reporter, ds.write(s, 26));
}
- REPORTER_ASSERT(reporter, ds.getOffset() == 100 * 26);
+ REPORTER_ASSERT(reporter, ds.bytesWritten() == 100 * 26);
char* dst = new char[100 * 26 + 1];
dst[100*26] = '*';
@@ -97,7 +97,7 @@ static void TestWStream(skiatest::Reporter* reporter) {
{
std::unique_ptr<SkStreamAsset> stream(ds.detachAsStream());
REPORTER_ASSERT(reporter, 100 * 26 == stream->getLength());
- REPORTER_ASSERT(reporter, ds.getOffset() == 0);
+ REPORTER_ASSERT(reporter, ds.bytesWritten() == 0);
test_loop_stream(reporter, stream.get(), s, 26, 100);
std::unique_ptr<SkStreamAsset> stream2(stream->duplicate());
@@ -115,12 +115,12 @@ static void TestWStream(skiatest::Reporter* reporter) {
for (i = 0; i < 100; i++) {
REPORTER_ASSERT(reporter, ds.write(s, 26));
}
- REPORTER_ASSERT(reporter, ds.getOffset() == 100 * 26);
+ REPORTER_ASSERT(reporter, ds.bytesWritten() == 100 * 26);
{
// Test that this works after a snapshot.
std::unique_ptr<SkStreamAsset> stream(ds.detachAsStream());
- REPORTER_ASSERT(reporter, ds.getOffset() == 0);
+ REPORTER_ASSERT(reporter, ds.bytesWritten() == 0);
test_loop_stream(reporter, stream.get(), s, 26, 100);
std::unique_ptr<SkStreamAsset> stream2(stream->duplicate());
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-07 05:22:19 +0000