1610835624
Reason for revert: need to update unittest in blink: FAILED: /b/build/goma/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang++ -MMD -MF obj/third_party/WebKit/Source/core/page/webkit_unit_tests.PrintContextTest.o.d -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE=0 -DCHROMIUM_BUILD -DCR_CLANG_REVISION=261368-1 -DCOMPONENT_BUILD -DUSE_LIBJPEG_TURBO=1 -DENABLE_WEBRTC=1 -DENABLE_MEDIA_ROUTER=1 -DENABLE_PEPPER_CDMS -DENABLE_CONFIGURATION_POLICY -DENABLE_NOTIFICATIONS -DENABLE_TOPCHROME_MD=1 -DDCHECK_ALWAYS_ON=1 -DFIELDTRIAL_TESTING_ENABLED -DENABLE_TASK_MANAGER=1 -DENABLE_EXTENSIONS=1 -DENABLE_PDF=1 -DENABLE_PLUGIN_INSTALLATION=1 -DENABLE_PLUGINS=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_THEMES=1 -DENABLE_AUTOFILL_DIALOG=1 -DENABLE_PRINTING=1 -DENABLE_BASIC_PRINTING=1 -DENABLE_PRINT_PREVIEW=1 -DENABLE_SPELLCHECK=1 -DUSE_BROWSER_SPELLCHECKER=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_APP_LIST=1 -DENABLE_SETTINGS_APP=1 -DENABLE_SUPERVISED_USERS=1 -DENABLE_SERVICE_DISCOVERY=1 -DV8_USE_EXTERNAL_STARTUP_DATA -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DBLINK_IMPLEMENTATION=1 -DINSIDE_BLINK -DMOJO_USE_SYSTEM_IMPL -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 -DSKIA_DLL -DGR_GL_IGNORE_ES3_MSAA=0 -DSK_SUPPORT_GPU=1 -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DENABLE_LAYOUT_UNIT_IN_INLINE_BOXES=0 -DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1 -DENABLE_INPUT_MULTIPLE_FIELDS_UI=1 -DWTF_USE_ICCJPEG=1 -DWTF_USE_QCMSLIB=1 -DENABLE_OILPAN=1 -DUNIT_TEST -DGTEST_HAS_RTTI=0 -DV8_SHARED -DUSING_V8_SHARED -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -Igen -I../../third_party/WebKit/public/web -I../../third_party/WebKit/Source/web -I../../third_party/WebKit/Source/web/src -I../../third_party/WebKit/public/web/mac -I../.. -I../../skia/config -I../../third_party/WebKit/Source -I../../third_party/khronos -I../../gpu -Igen/angle -I../../third_party/WebKit -I../../skia/ext -I../../third_party/skia/include/core -I../../third_party/skia/include/effects -I../../third_party/skia/include/pdf -I../../third_party/skia/include/gpu -I../../third_party/skia/include/lazy -I../../third_party/skia/include/pathops -I../../third_party/skia/include/pipe -I../../third_party/skia/include/ports -I../../third_party/skia/include/utils -I../../third_party/skia/include/utils/mac -I../../third_party/icu/source/common -I../../third_party/npapi -I../../third_party/npapi/bindings -I../../third_party/libpng -I../../third_party/ots/include -I../../third_party/qcms/src -I../../third_party/iccjpeg -I../../third_party/libjpeg_turbo -I../../third_party/WebKit -I../../third_party/icu/source/i18n -I../../testing/gmock/include -I../../testing/gtest/include -I../../third_party/libwebp -I../../third_party/zlib -I../../v8/include -Igen/blink -isysroot /Applications/Xcode5.1.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk -O0 -fvisibility=hidden -Werror -mmacosx-version-min=10.6 -arch x86_64 -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-selector-type-mismatch -Wpartial-availability -Wheader-hygiene -Wno-char-subscripts -Wno-unneeded-internal-declaration -Wno-covered-switch-default -Wstring-conversion -Wno-c++11-narrowing -Wno-deprecated-register -Wno-inconsistent-missing-override -Wno-shift-negative-value -Wexit-time-destructors -std=c++11 -stdlib=libc++ -fno-rtti -fno-exceptions -fvisibility-inlines-hidden -fno-threadsafe-statics -Xclang -load -Xclang /b/build/slave/mac/build/src/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib -Xclang -add-plugin -Xclang find-bad-constructs -Xclang -plugin-arg-find-bad-constructs -Xclang check-templates -Xclang -plugin-arg-find-bad-constructs -Xclang follow-macro-expansion -fcolor-diagnostics -fno-strict-aliasing -Xclang -load -Xclang /b/build/slave/mac/build/src/third_party/llvm-build/Release+Asserts/lib/libBlinkGCPlugin.dylib -Xclang -add-plugin -Xclang blink-gc-plugin -Xclang -plugin-arg-blink-gc-plugin -Xclang enable-oilpan -Xclang -plugin-arg-blink-gc-plugin -Xclang warn-raw-ptr -fstack-protector-all -c ../../third_party/WebKit/Source/core/page/PrintContextTest.cpp -o obj/third_party/WebKit/Source/core/page/webkit_unit_tests.PrintContextTest.o ../../third_party/WebKit/Source/core/page/PrintContextTest.cpp:54:20: error: no member named 'getAnnotation' in 'SkPaint' if (!paint.getAnnotation()) ~~~~~ ^ Original issue's description: > move annotations to canvas virtual > > In an effort to do it all at once, this change assumes that its ok to ignore annotations that were previously stored on paints in old SKP files (since this feature is only interesting to PDF printing). > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1744103002 > > Committed: https://skia.googlesource.com/skia/+/0eda2587cc9233066cb3f3fec08f35c061780f8e TBR=halcanary@google.com,fmalita@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1761793003
367 lines
12 KiB
C++
367 lines
12 KiB
C++
/*
|
|
* Copyright 2014 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#ifndef SkRecords_DEFINED
|
|
#define SkRecords_DEFINED
|
|
|
|
#include "SkCanvas.h"
|
|
#include "SkDrawable.h"
|
|
#include "SkImageFilter.h"
|
|
#include "SkMatrix.h"
|
|
#include "SkPath.h"
|
|
#include "SkPicture.h"
|
|
#include "SkRect.h"
|
|
#include "SkRRect.h"
|
|
#include "SkRSXform.h"
|
|
#include "SkTextBlob.h"
|
|
|
|
namespace SkRecords {
|
|
|
|
// A list of all the types of canvas calls we can record.
|
|
// Each of these is reified into a struct below.
|
|
//
|
|
// (We're using the macro-of-macro trick here to do several different things with the same list.)
|
|
//
|
|
// We leave this SK_RECORD_TYPES macro defined for use by code that wants to operate on SkRecords
|
|
// types polymorphically. (See SkRecord::Record::{visit,mutate} for an example.)
|
|
//
|
|
// Order doesn't technically matter here, but the compiler can generally generate better code if
|
|
// you keep them semantically grouped, especially the Draws. It's also nice to leave NoOp at 0.
|
|
#define SK_RECORD_TYPES(M) \
|
|
M(NoOp) \
|
|
M(Restore) \
|
|
M(Save) \
|
|
M(SaveLayer) \
|
|
M(SetMatrix) \
|
|
M(Concat) \
|
|
M(ClipPath) \
|
|
M(ClipRRect) \
|
|
M(ClipRect) \
|
|
M(ClipRegion) \
|
|
M(DrawBitmap) \
|
|
M(DrawBitmapNine) \
|
|
M(DrawBitmapRect) \
|
|
M(DrawBitmapRectFast) \
|
|
M(DrawBitmapRectFixedSize) \
|
|
M(DrawDrawable) \
|
|
M(DrawImage) \
|
|
M(DrawImageRect) \
|
|
M(DrawImageNine) \
|
|
M(DrawDRRect) \
|
|
M(DrawOval) \
|
|
M(DrawPaint) \
|
|
M(DrawPath) \
|
|
M(DrawPatch) \
|
|
M(DrawPicture) \
|
|
M(DrawPoints) \
|
|
M(DrawPosText) \
|
|
M(DrawPosTextH) \
|
|
M(DrawText) \
|
|
M(DrawTextOnPath) \
|
|
M(DrawRRect) \
|
|
M(DrawRect) \
|
|
M(DrawTextBlob) \
|
|
M(DrawAtlas) \
|
|
M(DrawVertices)
|
|
|
|
// Defines SkRecords::Type, an enum of all record types.
|
|
#define ENUM(T) T##_Type,
|
|
enum Type { SK_RECORD_TYPES(ENUM) };
|
|
#undef ENUM
|
|
|
|
#define ACT_AS_PTR(ptr) \
|
|
operator T*() const { return ptr; } \
|
|
T* operator->() const { return ptr; }
|
|
|
|
template <typename T>
|
|
class RefBox : SkNoncopyable {
|
|
public:
|
|
RefBox() {}
|
|
RefBox(T* obj) : fObj(SkSafeRef(obj)) {}
|
|
RefBox(RefBox&& o) : fObj(o.fObj) {
|
|
o.fObj = nullptr;
|
|
}
|
|
~RefBox() { SkSafeUnref(fObj); }
|
|
|
|
ACT_AS_PTR(fObj);
|
|
|
|
private:
|
|
T* fObj;
|
|
};
|
|
|
|
// An Optional doesn't own the pointer's memory, but may need to destroy non-POD data.
|
|
template <typename T>
|
|
class Optional : SkNoncopyable {
|
|
public:
|
|
Optional() : fPtr(nullptr) {}
|
|
Optional(T* ptr) : fPtr(ptr) {}
|
|
Optional(Optional&& o) : fPtr(o.fPtr) {
|
|
o.fPtr = nullptr;
|
|
}
|
|
~Optional() { if (fPtr) fPtr->~T(); }
|
|
|
|
ACT_AS_PTR(fPtr);
|
|
private:
|
|
T* fPtr;
|
|
};
|
|
|
|
// Like Optional, but ptr must not be NULL.
|
|
template <typename T>
|
|
class Adopted : SkNoncopyable {
|
|
public:
|
|
Adopted(T* ptr) : fPtr(ptr) { SkASSERT(fPtr); }
|
|
Adopted(Adopted* source) {
|
|
// Transfer ownership from source to this.
|
|
fPtr = source->fPtr;
|
|
source->fPtr = NULL;
|
|
}
|
|
~Adopted() { if (fPtr) fPtr->~T(); }
|
|
|
|
ACT_AS_PTR(fPtr);
|
|
private:
|
|
T* fPtr;
|
|
};
|
|
|
|
// PODArray doesn't own the pointer's memory, and we assume the data is POD.
|
|
template <typename T>
|
|
class PODArray {
|
|
public:
|
|
PODArray() {}
|
|
PODArray(T* ptr) : fPtr(ptr) {}
|
|
// Default copy and assign.
|
|
|
|
ACT_AS_PTR(fPtr);
|
|
private:
|
|
T* fPtr;
|
|
};
|
|
|
|
#undef ACT_AS_PTR
|
|
|
|
// Like SkBitmap, but deep copies pixels if they're not immutable.
|
|
// Using this, we guarantee the immutability of all bitmaps we record.
|
|
class ImmutableBitmap : SkNoncopyable {
|
|
public:
|
|
ImmutableBitmap() {}
|
|
ImmutableBitmap(const SkBitmap& bitmap);
|
|
ImmutableBitmap(ImmutableBitmap&& o) {
|
|
fBitmap.swap(o.fBitmap);
|
|
}
|
|
|
|
int width() const { return fBitmap.width(); }
|
|
int height() const { return fBitmap.height(); }
|
|
|
|
// While the pixels are immutable, SkBitmap itself is not thread-safe, so return a copy.
|
|
SkBitmap shallowCopy() const { return fBitmap; }
|
|
private:
|
|
SkBitmap fBitmap;
|
|
};
|
|
|
|
// SkPath::getBounds() isn't thread safe unless we precache the bounds in a singlethreaded context.
|
|
// SkPath::cheapComputeDirection() is similar.
|
|
// Recording is a convenient time to cache these, or we can delay it to between record and playback.
|
|
struct PreCachedPath : public SkPath {
|
|
PreCachedPath() {}
|
|
PreCachedPath(const SkPath& path);
|
|
};
|
|
|
|
// Like SkPath::getBounds(), SkMatrix::getType() isn't thread safe unless we precache it.
|
|
// This may not cover all SkMatrices used by the picture (e.g. some could be hiding in a shader).
|
|
struct TypedMatrix : public SkMatrix {
|
|
TypedMatrix() {}
|
|
TypedMatrix(const SkMatrix& matrix);
|
|
};
|
|
|
|
enum Tags {
|
|
kDraw_Tag = 1, // May draw something (usually named DrawFoo).
|
|
kHasImage_Tag = 2, // Contains an SkImage or SkBitmap.
|
|
kHasText_Tag = 4, // Contains text.
|
|
};
|
|
|
|
// A macro to make it a little easier to define a struct that can be stored in SkRecord.
|
|
#define RECORD(T, tags, ...) \
|
|
struct T { \
|
|
static const Type kType = T##_Type; \
|
|
static const int kTags = tags; \
|
|
__VA_ARGS__; \
|
|
};
|
|
|
|
RECORD(NoOp, 0);
|
|
RECORD(Restore, 0,
|
|
SkIRect devBounds;
|
|
TypedMatrix matrix);
|
|
RECORD(Save, 0);
|
|
|
|
RECORD(SaveLayer, 0,
|
|
Optional<SkRect> bounds;
|
|
Optional<SkPaint> paint;
|
|
RefBox<const SkImageFilter> backdrop;
|
|
SkCanvas::SaveLayerFlags saveLayerFlags);
|
|
|
|
RECORD(SetMatrix, 0,
|
|
TypedMatrix matrix);
|
|
RECORD(Concat, 0,
|
|
TypedMatrix matrix);
|
|
|
|
struct RegionOpAndAA {
|
|
RegionOpAndAA() {}
|
|
RegionOpAndAA(SkRegion::Op op, bool aa) : op(op), aa(aa) {}
|
|
SkRegion::Op op : 31; // This really only needs to be 3, but there's no win today to do so.
|
|
unsigned aa : 1; // MSVC won't pack an enum with an bool, so we call this an unsigned.
|
|
};
|
|
static_assert(sizeof(RegionOpAndAA) == 4, "RegionOpAndAASize");
|
|
|
|
RECORD(ClipPath, 0,
|
|
SkIRect devBounds;
|
|
PreCachedPath path;
|
|
RegionOpAndAA opAA);
|
|
RECORD(ClipRRect, 0,
|
|
SkIRect devBounds;
|
|
SkRRect rrect;
|
|
RegionOpAndAA opAA);
|
|
RECORD(ClipRect, 0,
|
|
SkIRect devBounds;
|
|
SkRect rect;
|
|
RegionOpAndAA opAA);
|
|
RECORD(ClipRegion, 0,
|
|
SkIRect devBounds;
|
|
SkRegion region;
|
|
SkRegion::Op op);
|
|
|
|
// While not strictly required, if you have an SkPaint, it's fastest to put it first.
|
|
RECORD(DrawBitmap, kDraw_Tag|kHasImage_Tag,
|
|
Optional<SkPaint> paint;
|
|
ImmutableBitmap bitmap;
|
|
SkScalar left;
|
|
SkScalar top);
|
|
RECORD(DrawBitmapNine, kDraw_Tag|kHasImage_Tag,
|
|
Optional<SkPaint> paint;
|
|
ImmutableBitmap bitmap;
|
|
SkIRect center;
|
|
SkRect dst);
|
|
RECORD(DrawBitmapRect, kDraw_Tag|kHasImage_Tag,
|
|
Optional<SkPaint> paint;
|
|
ImmutableBitmap bitmap;
|
|
Optional<SkRect> src;
|
|
SkRect dst);
|
|
RECORD(DrawBitmapRectFast, kDraw_Tag|kHasImage_Tag,
|
|
Optional<SkPaint> paint;
|
|
ImmutableBitmap bitmap;
|
|
Optional<SkRect> src;
|
|
SkRect dst);
|
|
RECORD(DrawBitmapRectFixedSize, kDraw_Tag|kHasImage_Tag,
|
|
SkPaint paint;
|
|
ImmutableBitmap bitmap;
|
|
SkRect src;
|
|
SkRect dst;
|
|
SkCanvas::SrcRectConstraint constraint);
|
|
RECORD(DrawDRRect, kDraw_Tag,
|
|
SkPaint paint;
|
|
SkRRect outer;
|
|
SkRRect inner);
|
|
RECORD(DrawDrawable, kDraw_Tag,
|
|
Optional<SkMatrix> matrix;
|
|
SkRect worstCaseBounds;
|
|
int32_t index);
|
|
RECORD(DrawImage, kDraw_Tag|kHasImage_Tag,
|
|
Optional<SkPaint> paint;
|
|
RefBox<const SkImage> image;
|
|
SkScalar left;
|
|
SkScalar top);
|
|
RECORD(DrawImageRect, kDraw_Tag|kHasImage_Tag,
|
|
Optional<SkPaint> paint;
|
|
RefBox<const SkImage> image;
|
|
Optional<SkRect> src;
|
|
SkRect dst;
|
|
SkCanvas::SrcRectConstraint constraint);
|
|
RECORD(DrawImageNine, kDraw_Tag|kHasImage_Tag,
|
|
Optional<SkPaint> paint;
|
|
RefBox<const SkImage> image;
|
|
SkIRect center;
|
|
SkRect dst);
|
|
RECORD(DrawOval, kDraw_Tag,
|
|
SkPaint paint;
|
|
SkRect oval);
|
|
RECORD(DrawPaint, kDraw_Tag,
|
|
SkPaint paint);
|
|
RECORD(DrawPath, kDraw_Tag,
|
|
SkPaint paint;
|
|
PreCachedPath path);
|
|
RECORD(DrawPicture, kDraw_Tag,
|
|
Optional<SkPaint> paint;
|
|
RefBox<const SkPicture> picture;
|
|
TypedMatrix matrix);
|
|
RECORD(DrawPoints, kDraw_Tag,
|
|
SkPaint paint;
|
|
SkCanvas::PointMode mode;
|
|
unsigned count;
|
|
SkPoint* pts);
|
|
RECORD(DrawPosText, kDraw_Tag|kHasText_Tag,
|
|
SkPaint paint;
|
|
PODArray<char> text;
|
|
size_t byteLength;
|
|
PODArray<SkPoint> pos);
|
|
RECORD(DrawPosTextH, kDraw_Tag|kHasText_Tag,
|
|
SkPaint paint;
|
|
PODArray<char> text;
|
|
unsigned byteLength;
|
|
SkScalar y;
|
|
PODArray<SkScalar> xpos);
|
|
RECORD(DrawRRect, kDraw_Tag,
|
|
SkPaint paint;
|
|
SkRRect rrect);
|
|
RECORD(DrawRect, kDraw_Tag,
|
|
SkPaint paint;
|
|
SkRect rect);
|
|
RECORD(DrawText, kDraw_Tag|kHasText_Tag,
|
|
SkPaint paint;
|
|
PODArray<char> text;
|
|
size_t byteLength;
|
|
SkScalar x;
|
|
SkScalar y);
|
|
RECORD(DrawTextBlob, kDraw_Tag|kHasText_Tag,
|
|
SkPaint paint;
|
|
RefBox<const SkTextBlob> blob;
|
|
SkScalar x;
|
|
SkScalar y);
|
|
RECORD(DrawTextOnPath, kDraw_Tag|kHasText_Tag,
|
|
SkPaint paint;
|
|
PODArray<char> text;
|
|
size_t byteLength;
|
|
PreCachedPath path;
|
|
TypedMatrix matrix);
|
|
RECORD(DrawPatch, kDraw_Tag,
|
|
SkPaint paint;
|
|
PODArray<SkPoint> cubics;
|
|
PODArray<SkColor> colors;
|
|
PODArray<SkPoint> texCoords;
|
|
RefBox<SkXfermode> xmode);
|
|
RECORD(DrawAtlas, kDraw_Tag|kHasImage_Tag,
|
|
Optional<SkPaint> paint;
|
|
RefBox<const SkImage> atlas;
|
|
PODArray<SkRSXform> xforms;
|
|
PODArray<SkRect> texs;
|
|
PODArray<SkColor> colors;
|
|
int count;
|
|
SkXfermode::Mode mode;
|
|
Optional<SkRect> cull);
|
|
RECORD(DrawVertices, kDraw_Tag,
|
|
SkPaint paint;
|
|
SkCanvas::VertexMode vmode;
|
|
int vertexCount;
|
|
PODArray<SkPoint> vertices;
|
|
PODArray<SkPoint> texs;
|
|
PODArray<SkColor> colors;
|
|
RefBox<SkXfermode> xmode;
|
|
PODArray<uint16_t> indices;
|
|
int indexCount);
|
|
|
|
#undef RECORD
|
|
|
|
} // namespace SkRecords
|
|
|
|
#endif//SkRecords_DEFINED
|