Chromium Code Reviews| Index: third_party/WebKit/Source/platform/graphics/GraphicsLayerDebugInfo.h |
| diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsLayerDebugInfo.h b/third_party/WebKit/Source/platform/graphics/GraphicsLayerDebugInfo.h |
| index be57a28507415d4c48f2f102856c86b1a2cae849..b5ebc2cc0c9f92b5f313c448e73359323ee0499e 100644 |
| --- a/third_party/WebKit/Source/platform/graphics/GraphicsLayerDebugInfo.h |
| +++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayerDebugInfo.h |
| @@ -31,26 +31,27 @@ |
| #ifndef GraphicsLayerDebugInfo_h |
| #define GraphicsLayerDebugInfo_h |
| -#include "platform/JSONValues.h" |
| +#include "base/memory/ref_counted.h" |
| #include "platform/geometry/FloatRect.h" |
| #include "platform/graphics/CompositingReasons.h" |
| #include "platform/graphics/PaintInvalidationReason.h" |
| -#include "public/platform/WebGraphicsLayerDebugInfo.h" |
| - |
| #include "wtf/Vector.h" |
| +namespace base { |
| +namespace trace_event { |
| +class TracedValue; |
| +} |
| +} |
| + |
| namespace blink { |
| -class GraphicsLayerDebugInfo final : public WebGraphicsLayerDebugInfo { |
| +class GraphicsLayerDebugInfo { |
| public: |
| GraphicsLayerDebugInfo(); |
| - ~GraphicsLayerDebugInfo() override; |
| - |
| - void appendAsTraceFormat(WebString* out) const override; |
| + ~GraphicsLayerDebugInfo(); |
| - GraphicsLayerDebugInfo* clone() const; |
| + scoped_refptr<base::trace_event::TracedValue> asTracedValue() const; |
|
chrishtr
2015/11/17 00:21:49
Elliott communicated it offline I think, but for c
chrishtr
2015/11/17 00:24:11
s/Blink/core/
|
| - void setDebugName(const String& name) { m_debugName = name; } |
| CompositingReasons compositingReasons() const { return m_compositingReasons; } |
| void setCompositingReasons(CompositingReasons reasons) { m_compositingReasons = reasons; } |
| void setOwnerNodeId(int id) { m_ownerNodeId = id; } |
| @@ -59,17 +60,15 @@ public: |
| void clearAnnotatedInvalidateRects(); |
| private: |
| - void appendAnnotatedInvalidateRects(JSONObject*) const; |
| - void appendCompositingReasons(JSONObject*) const; |
| - void appendDebugName(JSONObject*) const; |
| - void appendOwnerNodeId(JSONObject*) const; |
| + void appendAnnotatedInvalidateRects(base::trace_event::TracedValue*) const; |
| + void appendCompositingReasons(base::trace_event::TracedValue*) const; |
| + void appendOwnerNodeId(base::trace_event::TracedValue*) const; |
| struct AnnotatedInvalidationRect { |
| FloatRect rect; |
| PaintInvalidationReason reason; |
| }; |
| - String m_debugName; |
| CompositingReasons m_compositingReasons; |
| int m_ownerNodeId; |
| Vector<AnnotatedInvalidationRect> m_invalidations; |