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

Unified Diff: Source/platform/graphics/GraphicsContext.h

Issue 1164683007: Copy SkMetaData before painting printed plugin contents. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/platform/graphics/GraphicsContext.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/graphics/GraphicsContext.h
diff --git a/Source/platform/graphics/GraphicsContext.h b/Source/platform/graphics/GraphicsContext.h
index da04802e1c85b82768c8b6c6d0a09e46e40c50ca..4fea9389018a34f969f75909c8b518acd51a2631 100644
--- a/Source/platform/graphics/GraphicsContext.h
+++ b/Source/platform/graphics/GraphicsContext.h
@@ -37,6 +37,7 @@
#include "platform/graphics/ImageOrientation.h"
#include "platform/graphics/GraphicsContextState.h"
#include "platform/graphics/skia/SkiaUtils.h"
+#include "third_party/skia/include/core/SkMetaData.h"
#include "third_party/skia/include/core/SkPictureRecorder.h"
#include "third_party/skia/include/core/SkRegion.h"
#include "wtf/FastAllocBase.h"
@@ -73,13 +74,13 @@ public:
FullyDisabled = 1 // Do absolutely minimal work to remove the cost of the context from performance tests.
};
- explicit GraphicsContext(DisplayItemList*, DisabledMode = NothingDisabled);
+ explicit GraphicsContext(DisplayItemList*, DisabledMode = NothingDisabled, SkMetaData* = 0);
// TODO(chrishtr): Once Slimming Paint launches this should be removed (crbug.com/471333).
// A 0 canvas is allowed, but in such cases the context must only have canvas
// related commands called when within a beginRecording/endRecording block.
// Furthermore, save/restore calls must be balanced any time the canvas is 0.
- static PassOwnPtr<GraphicsContext> deprecatedCreateWithCanvas(SkCanvas*, DisabledMode = NothingDisabled);
+ static PassOwnPtr<GraphicsContext> deprecatedCreateWithCanvas(SkCanvas*, DisabledMode = NothingDisabled, SkMetaData* = 0);
~GraphicsContext();
@@ -306,7 +307,7 @@ public:
static PassRefPtr<SkColorFilter> WebCoreColorFilterToSkiaColorFilter(ColorFilter);
private:
- explicit GraphicsContext(SkCanvas*, DisplayItemList*, DisabledMode = NothingDisabled);
+ explicit GraphicsContext(SkCanvas*, DisplayItemList*, DisabledMode = NothingDisabled, SkMetaData* = 0);
const GraphicsContextState* immutableState() const { return m_paintState; }
@@ -370,6 +371,8 @@ private:
bool isRecording() const;
+ const SkMetaData& metaData() const { return m_metaData; }
+
// null indicates painting is contextDisabled. Never delete this object.
SkCanvas* m_canvas;
@@ -393,6 +396,8 @@ private:
Vector<OwnPtr<RecordingState>> m_recordingStateStack;
SkPictureRecorder m_pictureRecorder;
+ SkMetaData m_metaData;
+
#if ENABLE(ASSERT)
unsigned m_layerCount;
bool m_disableDestructionChecks;
@@ -405,6 +410,7 @@ private:
unsigned m_accelerated : 1;
unsigned m_printing : 1;
+ unsigned m_hasMetaData : 1;
};
} // namespace blink
« no previous file with comments | « no previous file | Source/platform/graphics/GraphicsContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698