Add an alternate paintContents method to WebContentLayerClient.

Source/platform/graphics/ContentLayerDelegate.h

Index: Source/platform/graphics/ContentLayerDelegate.h
diff --git a/Source/platform/graphics/OpaqueRectTrackingContentLayerDelegate.h b/Source/platform/graphics/ContentLayerDelegate.h
similarity index 75%
rename from Source/platform/graphics/OpaqueRectTrackingContentLayerDelegate.h
rename to Source/platform/graphics/ContentLayerDelegate.h
index f84fadf9ad427edc9eb587a284cbff07b771cebd..f9e93d4346c889593405f5e3ad20df8f95d6db94 100644
--- a/Source/platform/graphics/OpaqueRectTrackingContentLayerDelegate.h
+++ b/Source/platform/graphics/ContentLayerDelegate.h
@@ -22,8 +22,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef OpaqueRectTrackingContentLayerDelegate_h
-#define OpaqueRectTrackingContentLayerDelegate_h
+#ifndef ContentLayerDelegate_h
+#define ContentLayerDelegate_h
 
 #include "platform/PlatformExport.h"
 #include "public/platform/WebContentLayerClient.h"
@@ -45,19 +45,23 @@ protected:
     virtual ~GraphicsContextPainter() { }
 };
 
-class PLATFORM_EXPORT OpaqueRectTrackingContentLayerDelegate : public WebContentLayerClient {
-    WTF_MAKE_NONCOPYABLE(OpaqueRectTrackingContentLayerDelegate);
+class PLATFORM_EXPORT ContentLayerDelegate : public WebContentLayerClient {
+    WTF_MAKE_NONCOPYABLE(ContentLayerDelegate);
+
 public:
-    explicit OpaqueRectTrackingContentLayerDelegate(GraphicsContextPainter*);
-    virtual ~OpaqueRectTrackingContentLayerDelegate();
+    explicit ContentLayerDelegate(GraphicsContextPainter*);
+    virtual ~ContentLayerDelegate();
 
     // If we know that everything that will be painted through this delegate, then we don't bother
     // tracking opaqueness.

[jamesr, 2014/09/15 17:38:10]

this bit isn't about tracking any more, it looks like, it's about
setCertainlyOpaque which controls whether LCD text is generated. can you update?

[danakj, 2014/09/15 17:41:55]

Done.

-    void setOpaque(bool opaque) { m_opaque = opaque; }
+    void setOpaque(bool opaque)
+    {

[jamesr, 2014/09/15 17:38:10]

the one-line version seemed fine, imho, but if this is what clang-format does
then so be it

+        m_opaque = opaque;
+    }
 
     // WebContentLayerClient implementation.
-    virtual void paintContents(SkCanvas*, const WebRect& clip, bool canPaintLCDText, WebFloatRect& opaque,
-        WebContentLayerClient::GraphicsContextStatus = GraphicsContextEnabled) OVERRIDE;
+    virtual void paintContents(SkCanvas*, const WebRect& clip, bool canPaintLCDText, WebFloatRect& opaque, WebContentLayerClient::GraphicsContextStatus = GraphicsContextEnabled) OVERRIDE;
+    virtual void paintContents(SkCanvas*, const WebRect& clip, bool canPaintLCDText, WebContentLayerClient::GraphicsContextStatus = GraphicsContextEnabled) OVERRIDE;
 
 private:
     GraphicsContextPainter* m_painter;
@@ -66,4 +70,4 @@ private:
 
 } // namespace blink
 
-#endif // OpaqueRectTrackingContentLayerDelegate_h
+#endif // ContentLayerDelegate_h