Remove rendering dependency in GraphicsContextAnnotation

Source/core/platform/graphics/GraphicsContextAnnotation.h

Index: Source/core/platform/graphics/GraphicsContextAnnotation.h
diff --git a/Source/core/platform/graphics/GraphicsContextAnnotation.h b/Source/core/platform/graphics/GraphicsContextAnnotation.h
index f30a38d87ca8146856f6344054c08f4c22aa9b04..dd31e7a475a36f56a99010c3666cd8d12cb32e84 100644
--- a/Source/core/platform/graphics/GraphicsContextAnnotation.h
+++ b/Source/core/platform/graphics/GraphicsContextAnnotation.h
@@ -34,17 +34,8 @@
 #ifndef GraphicsContextAnnotation_h
 #define GraphicsContextAnnotation_h
 
-#define ANNOTATE_GRAPHICS_CONTEXT(paintInfo, renderer) \
-    GraphicsContextAnnotator scopedGraphicsContextAnnotator; \
-    if (UNLIKELY(paintInfo.context->annotationMode())) \
-        scopedGraphicsContextAnnotator.annotate(paintInfo, renderer)
-
 namespace WebCore {
 
-class GraphicsContext;
-class RenderObject;
-struct PaintInfo;
-
 enum AnnotationMode {
     AnnotateRendererName    = 1 << 0,
     AnnotatePaintPhase      = 1 << 1,
@@ -60,7 +51,7 @@ typedef Vector<std::pair<const char*, String> > AnnotationList;
 
 class GraphicsContextAnnotation {
 public:
-    GraphicsContextAnnotation(const PaintInfo&, const RenderObject*);
+    GraphicsContextAnnotation(const char*, const char*, const String&, const String&, const String&);
 
     String rendererName() const { return m_rendererName; }
     String paintPhase() const { return m_paintPhase; }
@@ -78,26 +69,6 @@ private:
     String m_elementTag;
 };
 
-class GraphicsContextAnnotator {
-public:
-    GraphicsContextAnnotator()
-        : m_context(0)
-    { }
-
-    ~GraphicsContextAnnotator()
-    {
-        if (UNLIKELY(m_context != 0))
-            finishAnnotation();
-    }
-
-    void annotate(const PaintInfo&, const RenderObject*);
-
-private:
-    void finishAnnotation();
-
-    GraphicsContext* m_context;
-};
-
 } // namespace WebCore
 
 #endif // GraphicsContextAnnotation_h