| Index: Source/WebKit/chromium/src/PageOverlay.cpp
|
| diff --git a/Source/WebKit/chromium/src/PageOverlay.cpp b/Source/WebKit/chromium/src/PageOverlay.cpp
|
| index 566f7a5b87348cf9709d8795c738fe067661dee7..b2560a79dd011aa3a4dcef5ef909c6bf459ac751 100644
|
| --- a/Source/WebKit/chromium/src/PageOverlay.cpp
|
| +++ b/Source/WebKit/chromium/src/PageOverlay.cpp
|
| @@ -66,9 +66,9 @@ PageOverlay::PageOverlay(WebViewImpl* viewImpl, WebPageOverlay* overlay)
|
|
|
| class OverlayGraphicsLayerClientImpl : public WebCore::GraphicsLayerClient {
|
| public:
|
| - static PassOwnPtr<OverlayGraphicsLayerClientImpl*> create(WebViewImpl* webViewImpl, WebPageOverlay* overlay)
|
| + static PassOwnPtr<OverlayGraphicsLayerClientImpl*> create(WebPageOverlay* overlay)
|
| {
|
| - return adoptPtr(new OverlayGraphicsLayerClientImpl(webViewImpl, overlay));
|
| + return adoptPtr(new OverlayGraphicsLayerClientImpl(overlay));
|
| }
|
|
|
| virtual ~OverlayGraphicsLayerClientImpl() { }
|
| @@ -82,25 +82,13 @@ public:
|
| gc.restore();
|
| }
|
|
|
| - virtual float deviceScaleFactor() const
|
| - {
|
| - return m_webViewImpl->deviceScaleFactor();
|
| - }
|
| -
|
| - virtual float pageScaleFactor() const
|
| - {
|
| - return m_webViewImpl->pageScaleFactor();
|
| - }
|
| -
|
| private:
|
| - OverlayGraphicsLayerClientImpl(WebViewImpl* webViewImpl, WebPageOverlay* overlay)
|
| + explicit OverlayGraphicsLayerClientImpl(WebPageOverlay* overlay)
|
| : m_overlay(overlay)
|
| - , m_webViewImpl(webViewImpl)
|
| {
|
| }
|
|
|
| WebPageOverlay* m_overlay;
|
| - WebViewImpl* m_webViewImpl;
|
| };
|
|
|
| void PageOverlay::clear()
|
| @@ -119,7 +107,7 @@ void PageOverlay::update()
|
| invalidateWebFrame();
|
|
|
| if (!m_layer) {
|
| - m_layerClient = OverlayGraphicsLayerClientImpl::create(m_viewImpl, m_overlay);
|
| + m_layerClient = OverlayGraphicsLayerClientImpl::create(m_overlay);
|
| m_layer = GraphicsLayer::create(m_viewImpl->graphicsLayerFactory(), m_layerClient.get());
|
| m_layer->setName("WebViewImpl page overlay content");
|
| m_layer->setDrawsContent(true);
|
|
|