Move overdraw tracking code from GraphicsContext to CanvasRenderingContext2D

Source/platform/graphics/GraphicsContext.h

 /*
  * Copyright (C) 2003, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008-2009 Torch Mobile, Inc.
  * 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 43 matching lines @@
 class SkRRect;
 class SkTextBlob;
 struct SkRect;
 
 namespace blink {
 
 class ClipRecorderStack;
 class DisplayItemList;
 class ImageBuffer;
 class KURL;
-class GraphicsContextClient;
 
 class PLATFORM_EXPORT GraphicsContext {
     WTF_MAKE_NONCOPYABLE(GraphicsContext); WTF_MAKE_FAST_ALLOCATED;
 public:
     enum AccessMode {
         ReadOnly,
         ReadWrite
     };
 
     enum DisabledMode {
@@ skipping 24 matching lines @@
     void save();
     void restore();
 
 #if ENABLE(ASSERT)
     unsigned saveCount() const;
     void disableDestructionChecks() { m_disableDestructionChecks = true; }
 #endif
 
     bool hasStroke() const { return strokeStyle() != NoStroke && strokeThickness() > 0; }
 
-    // Returns true if the clip is anything more than an intersection of rectangles
-    bool hasComplexClip() const { return immutableState()->hasComplexClip(); }
-    void setHasComplexClip() { mutableState()->setHasComplexClip(); }
-
     float strokeThickness() const { return immutableState()->strokeData().thickness(); }
     void setStrokeThickness(float thickness) { mutableState()->setStrokeThickness(thickness); }
 
     StrokeStyle strokeStyle() const { return immutableState()->strokeData().style(); }
     void setStrokeStyle(StrokeStyle style) { mutableState()->setStrokeStyle(style); }
 
     Color strokeColor() const { return immutableState()->strokeColor(); }
     void setStrokeColor(const Color& color) { mutableState()->setStrokeColor(color); }
     SkColor effectiveStrokeColor() const { return immutableState()->effectiveStrokeColor(); }
 
@@ skipping 74 matching lines @@
 
     // Returns if the context is a printing context instead of a display
     // context. Bitmap shouldn't be resampled when printing to keep the best
     // possible quality.
     bool printing() const { return m_printing; }
     void setPrinting(bool printing) { m_printing = printing; }
 
     bool isAccelerated() const { return m_accelerated; }
     void setAccelerated(bool accelerated) { m_accelerated = accelerated; }
 
-    void setClient(GraphicsContextClient*);
-
     // The text region is empty until tracking is turned on.
     // It is never clerared by the context.
     void setTrackTextRegion(bool track) { m_trackTextRegion = track; }
     const SkRect& textRegion() const { return m_textRegion; }
 
     AnnotationModeFlags annotationMode() const { return m_annotationMode; }
     void setAnnotationMode(const AnnotationModeFlags mode) { m_annotationMode = mode; }
 
     SkColorFilter* colorFilter() const;
     void setColorFilter(ColorFilter);
@@ skipping 244 matching lines @@
 
     void didDrawTextInRect(const SkRect& textRect);
 
     void fillRectWithRoundedHole(const FloatRect&, const FloatRoundedRect& roundedHoleRect, const Color&);
 
     bool isRecording() const;
 
     // null indicates painting is contextDisabled. Never delete this object.
     SkCanvas* m_canvas;
 
-    GraphicsContextClient* m_client;
-
     // This being null indicates not to paint into a DisplayItemList, and instead directly into the canvas.
     DisplayItemList* m_displayItemList;
 
     ClipRecorderStack* m_clipRecorderStack;
 
     // Paint states stack. Enables local drawing state change with save()/restore() calls.
     // This state controls the appearance of drawn content.
     // We do not delete from this stack to avoid memory churn.
     Vector<OwnPtr<GraphicsContextState>> m_paintStateStack;
     // Current index on the stack. May not be the last thing on the stack.
@@ skipping 24 matching lines @@
 
     unsigned m_accelerated : 1;
     unsigned m_isCertainlyOpaque : 1;
     unsigned m_printing : 1;
     unsigned m_antialiasHairlineImages : 1;
 };
 
 } // namespace blink
 
 #endif // GraphicsContext_h