Commit 33ca7f66 authored by vandebo@chromium.org's avatar vandebo@chromium.org

Handle link annotations in Skia EMF device.

See Skia r4555

BUG=140184


Review URL: https://chromiumcodereview.appspot.com/10836343

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152433 0039d316-1c4b-4281-b951-d872f2087c98
parent 102bbfba
...@@ -15,6 +15,9 @@ ...@@ -15,6 +15,9 @@
namespace skia { namespace skia {
#define CHECK_FOR_NODRAW_ANNOTATION(paint) \
do { if (paint.isNoDrawAnnotation()) { return; } } while (0)
// static // static
SkDevice* VectorPlatformDeviceEmf::CreateDevice( SkDevice* VectorPlatformDeviceEmf::CreateDevice(
int width, int height, bool is_opaque, HANDLE shared_section) { int width, int height, bool is_opaque, HANDLE shared_section) {
...@@ -173,6 +176,7 @@ void VectorPlatformDeviceEmf::drawPoints(const SkDraw& draw, ...@@ -173,6 +176,7 @@ void VectorPlatformDeviceEmf::drawPoints(const SkDraw& draw,
void VectorPlatformDeviceEmf::drawRect(const SkDraw& draw, void VectorPlatformDeviceEmf::drawRect(const SkDraw& draw,
const SkRect& rect, const SkRect& rect,
const SkPaint& paint) { const SkPaint& paint) {
CHECK_FOR_NODRAW_ANNOTATION(paint);
if (paint.getPathEffect()) { if (paint.getPathEffect()) {
// Draw a path instead. // Draw a path instead.
SkPath path_orginal; SkPath path_orginal;
...@@ -210,6 +214,7 @@ void VectorPlatformDeviceEmf::drawPath(const SkDraw& draw, ...@@ -210,6 +214,7 @@ void VectorPlatformDeviceEmf::drawPath(const SkDraw& draw,
const SkPaint& paint, const SkPaint& paint,
const SkMatrix* prePathMatrix, const SkMatrix* prePathMatrix,
bool pathIsMutable) { bool pathIsMutable) {
CHECK_FOR_NODRAW_ANNOTATION(paint);
if (paint.getPathEffect()) { if (paint.getPathEffect()) {
// Apply the path effect forehand. // Apply the path effect forehand.
SkPath path_modified; SkPath path_modified;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment