Add an alternate paintContents method to WebContentLayerClient.

Source/platform/graphics/ContentLayerDelegate.h

 /*
  * Copyright (C) 2012 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.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS 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.
  */
 
-#ifndef OpaqueRectTrackingContentLayerDelegate_h
-#define OpaqueRectTrackingContentLayerDelegate_h
+#ifndef ContentLayerDelegate_h
+#define ContentLayerDelegate_h
 
 #include "platform/PlatformExport.h"
 #include "public/platform/WebContentLayerClient.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/PassOwnPtr.h"
 
 class SkCanvas;
 
 namespace blink {
 
 class GraphicsContext;
 class IntRect;
 
 class PLATFORM_EXPORT GraphicsContextPainter {
 public:
     virtual void paint(GraphicsContext&, const IntRect& clip) = 0;
 
 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;
     bool m_opaque;
 };
 
 } // namespace blink
 
-#endif // OpaqueRectTrackingContentLayerDelegate_h
+#endif // ContentLayerDelegate_h