Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: src/core/SkPictureRecord.cpp

Issue 1744103002: move annotations to canvas virtual (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/core/SkPictureRecord.h ('k') | src/core/SkReadBuffer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2011 Google Inc. 2 * Copyright 2011 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkPictureRecord.h" 8 #include "SkPictureRecord.h"
9 #include "SkDevice.h" 9 #include "SkDevice.h"
10 #include "SkImage_Base.h" 10 #include "SkImage_Base.h"
(...skipping 759 matching lines...) Expand 10 before | Expand all | Expand 10 after
770 if (colors) { 770 if (colors) {
771 fWriter.write(colors, count * sizeof(SkColor)); 771 fWriter.write(colors, count * sizeof(SkColor));
772 this->addInt(mode); 772 this->addInt(mode);
773 } 773 }
774 if (cull) { 774 if (cull) {
775 fWriter.write(cull, sizeof(SkRect)); 775 fWriter.write(cull, sizeof(SkRect));
776 } 776 }
777 this->validate(initialOffset, size); 777 this->validate(initialOffset, size);
778 } 778 }
779 779
780 void SkPictureRecord::onDrawAnnotation(const SkRect& rect, const char key[], SkD ata* value) {
781 size_t keyLen = fWriter.WriteStringSize(key);
782 size_t valueLen = fWriter.WriteDataSize(value);
783 size_t size = 4 + sizeof(SkRect) + keyLen + valueLen;
784
785 size_t initialOffset = this->addDraw(DRAW_ANNOTATION, &size);
786 this->addRect(rect);
787 fWriter.writeString(key);
788 fWriter.writeData(value);
789 this->validate(initialOffset, size);
790 }
791
780 /////////////////////////////////////////////////////////////////////////////// 792 ///////////////////////////////////////////////////////////////////////////////
781 793
782 SkSurface* SkPictureRecord::onNewSurface(const SkImageInfo& info, const SkSurfac eProps&) { 794 SkSurface* SkPictureRecord::onNewSurface(const SkImageInfo& info, const SkSurfac eProps&) {
783 return nullptr; 795 return nullptr;
784 } 796 }
785 797
786 // If we already have a stored, can we reuse it instead of also storing b? 798 // If we already have a stored, can we reuse it instead of also storing b?
787 static bool equivalent(const SkBitmap& a, const SkBitmap& b) { 799 static bool equivalent(const SkBitmap& a, const SkBitmap& b) {
788 if (a.info() != b.info() || a.pixelRefOrigin() != b.pixelRefOrigin()) { 800 if (a.info() != b.info() || a.pixelRefOrigin() != b.pixelRefOrigin()) {
789 // Requiring a.info() == b.info() may be overkill in some cases (alphaty pe mismatch), 801 // Requiring a.info() == b.info() may be overkill in some cases (alphaty pe mismatch),
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
957 void SkPictureRecord::addTextBlob(const SkTextBlob *blob) { 969 void SkPictureRecord::addTextBlob(const SkTextBlob *blob) {
958 int index = fTextBlobRefs.count(); 970 int index = fTextBlobRefs.count();
959 *fTextBlobRefs.append() = blob; 971 *fTextBlobRefs.append() = blob;
960 blob->ref(); 972 blob->ref();
961 // follow the convention of recording a 1-based index 973 // follow the convention of recording a 1-based index
962 this->addInt(index + 1); 974 this->addInt(index + 1);
963 } 975 }
964 976
965 /////////////////////////////////////////////////////////////////////////////// 977 ///////////////////////////////////////////////////////////////////////////////
966 978
OLDNEW
« no previous file with comments | « src/core/SkPictureRecord.h ('k') | src/core/SkReadBuffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698