Remove rendering dependency in GraphicsContextAnnotation

Source/core/platform/graphics/GraphicsContextAnnotation.h

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "wtf/Vector.h"
 #include "wtf/text/WTFString.h"
 
 #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,
     AnnotateElementId       = 1 << 2,
     AnnotateElementClass    = 1 << 3,
     AnnotateElementTag      = 1 << 4,
 
     AnnotateAll             = 0x1f
 };
 
 typedef unsigned AnnotationModeFlags;
 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&);

[f(malita), 2013/10/31 23:36:30]

IIRC, with the original CL there was a lot of attention paid to avoiding extra
string copies (deferring the actual string construction as much as possible).

Looks like now we're building the strings one level higher, and even thought
we're passing by reference there's an extra assignment to the fields. But I
believe that's OK, because WTF::String is just a thin wrapper around a
StringImpl refptr, so copying is shallow and cheap.

 
     String rendererName() const { return m_rendererName; }
     String paintPhase() const { return m_paintPhase; }
     String elementId() const { return m_elementId; }
     String elementClass() const { return m_elementClass; }
     String elementTag() const { return m_elementTag; }
 
     void asAnnotationList(AnnotationList&) const;
 
 private:
     const char* m_rendererName;
     const char* m_paintPhase;
     String m_elementId;
     String m_elementClass;
     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