Merge from Chromium at DEPS revision 267519
This commit was generated by merge_to_master.py.
Change-Id: I6002987b71e09742c68bad9c834ae800ff531f25
diff --git a/skia/skia_library.target.linux-x86_64.mk b/skia/skia_library.target.linux-x86_64.mk
index 1227738..903ca72 100644
--- a/skia/skia_library.target.linux-x86_64.mk
+++ b/skia/skia_library.target.linux-x86_64.mk
@@ -309,6 +309,10 @@
third_party/skia/src/pdf/SkPDFStream.cpp \
third_party/skia/src/pdf/SkPDFTypes.cpp \
third_party/skia/src/pdf/SkPDFUtils.cpp \
+ third_party/skia/src/record/SkRecordDraw.cpp \
+ third_party/skia/src/record/SkRecordOpts.cpp \
+ third_party/skia/src/record/SkRecorder.cpp \
+ third_party/skia/src/record/SkRecording.cpp \
third_party/skia/src/gpu/gl/GrGLCreateNullInterface.cpp \
third_party/skia/src/gpu/gl/SkNullGLContext.cpp \
third_party/skia/src/gpu/GrAAHairLinePathRenderer.cpp \
@@ -372,6 +376,7 @@
third_party/skia/src/gpu/effects/GrSingleTextureEffect.cpp \
third_party/skia/src/gpu/effects/GrTextureDomain.cpp \
third_party/skia/src/gpu/effects/GrTextureStripAtlas.cpp \
+ third_party/skia/src/gpu/gl/GrGLAssembleInterface.cpp \
third_party/skia/src/gpu/gl/GrGLBufferImpl.cpp \
third_party/skia/src/gpu/gl/GrGLCaps.cpp \
third_party/skia/src/gpu/gl/GrGLContext.cpp \
@@ -471,12 +476,13 @@
'-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \
'-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \
'-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \
- '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \
- '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \
- '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \
'-DSK_SUPPORT_LEGACY_N32_NAME' \
'-DSK_SUPPORT_LEGACY_PROCXFERMODE' \
+ '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \
'-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \
+ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \
+ '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \
+ '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \
'-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \
@@ -517,6 +523,7 @@
$(LOCAL_PATH)/third_party/skia/include/pdf \
$(LOCAL_PATH)/third_party/skia/include/pipe \
$(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/record \
$(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/third_party/skia/src/core \
$(LOCAL_PATH)/third_party/skia/src/opts \
@@ -614,12 +621,13 @@
'-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \
'-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \
'-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \
- '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \
- '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \
- '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \
'-DSK_SUPPORT_LEGACY_N32_NAME' \
'-DSK_SUPPORT_LEGACY_PROCXFERMODE' \
+ '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \
'-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \
+ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \
+ '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \
+ '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \
'-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \
@@ -660,6 +668,7 @@
$(LOCAL_PATH)/third_party/skia/include/pdf \
$(LOCAL_PATH)/third_party/skia/include/pipe \
$(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/record \
$(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/third_party/skia/src/core \
$(LOCAL_PATH)/third_party/skia/src/opts \