Miscellaneous cleanup to reduce number of includes in platform/graphics/

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 10 matching lines @@
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (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 "core/platform/graphics/AnnotationMode.h"
 #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*);
 
     String rendererName() const { return ASCIILiteral(m_rendererName); }
     String paintPhase() const { return ASCIILiteral(m_paintPhase); }
     String elementId() const { return m_elementId; }
     String elementClass() const { return m_elementClass; }
@@ skipping 25 matching lines @@
 
 private:
     void finishAnnotation();
 
     GraphicsContext* m_context;
 };
 
 } // namespace WebCore
 
 #endif // GraphicsContextAnnotation_h