Rolls cc and webkit_compositor up to 127340

webkit/compositor/WebContentLayerImpl.h

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WebContentLayerImpl_h
 #define WebContentLayerImpl_h
 
 #include "ContentLayerChromiumClient.h"
 #include "WebLayerImpl.h"
 #include <public/WebContentLayer.h>
-#include <wtf/PassRefPtr.h>
+#include <wtf/OwnPtr.h>
 
 namespace WebKit {
 class WebContentLayerClient;
 
 class WebContentLayerImpl : public WebContentLayer,
                             public WebCore::ContentLayerChromiumClient {
 public:
     explicit WebContentLayerImpl(WebContentLayerClient*);
 
     // WebContentLayer implementation.
     virtual WebLayer* layer() OVERRIDE;
     virtual void setDoubleSided(bool)  OVERRIDE;
     virtual void setContentsScale(float)  OVERRIDE;
     virtual void setUseLCDText(bool)  OVERRIDE;
     virtual void setDrawCheckerboardForMissingTiles(bool)  OVERRIDE;
 
 protected:
     virtual ~WebContentLayerImpl();
 
     // ContentLayerChromiumClient implementation.
     virtual void paintContents(SkCanvas*, const WebCore::IntRect& clip, WebCore::FloatRect& opaque) OVERRIDE;
 
-    OwnPtr<WebLayerImpl> m_webLayerImpl;
+    OwnPtr<WebLayerImpl> m_layer;
     WebContentLayerClient* m_client;
     bool m_drawsContent;
 };
 
 } // namespace WebKit
 
 #endif // WebContentLayerImpl_h