Add pixel readback to page popup

Source/web/WebPagePopupImpl.cpp

 /*
  * 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 26 matching lines @@
 #include "core/frame/Settings.h"
 #include "core/loader/EmptyClients.h"
 #include "core/loader/FrameLoadRequest.h"
 #include "core/page/Chrome.h"
 #include "core/page/DOMWindowPagePopup.h"
 #include "core/page/EventHandler.h"
 #include "core/page/FocusController.h"
 #include "core/page/Page.h"
 #include "core/page/PagePopupClient.h"
 #include "platform/TraceEvent.h"
+#include "public/platform/WebCompositeAndReadbackAsyncCallback.h"
 #include "public/platform/WebCursorInfo.h"
 #include "public/web/WebAXObject.h"
 #include "public/web/WebFrameClient.h"
 #include "public/web/WebViewClient.h"
 #include "public/web/WebWidgetClient.h"
 #include "web/WebInputEventConversion.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebSettingsImpl.h"
 #include "web/WebViewImpl.h"
 
 namespace blink {
 
 class PagePopupChromeClient : public EmptyChromeClient {
     WTF_MAKE_NONCOPYABLE(PagePopupChromeClient);
     WTF_MAKE_FAST_ALLOCATED;
 
 public:
     explicit PagePopupChromeClient(WebPagePopupImpl* popup)
         : m_popup(popup)
     {
-        ASSERT(m_popup->widgetClient());
+        ASSERT(m_popup->client());
     }
 
 private:
     virtual void closeWindowSoon() OVERRIDE
     {
         m_popup->closePopup();
     }
 
     virtual FloatRect windowRect() OVERRIDE
     {
         return FloatRect(m_popup->m_windowRectInScreen.x, m_popup->m_windowRectInScreen.y, m_popup->m_windowRectInScreen.width, m_popup->m_windowRectInScreen.height);
     }
 
     virtual void setWindowRect(const FloatRect& rect) OVERRIDE
     {
         m_popup->m_windowRectInScreen = IntRect(rect);
-        m_popup->widgetClient()->setWindowRect(m_popup->m_windowRectInScreen);
+        m_popup->client()->setWindowRect(m_popup->m_windowRectInScreen);
     }
 
     virtual IntRect rootViewToScreen(const IntRect& rect) const OVERRIDE
     {
         IntRect rectInScreen(rect);
         rectInScreen.move(m_popup->m_windowRectInScreen.x, m_popup->m_windowRectInScreen.y);
         return rectInScreen;
     }
 
     virtual void addMessageToConsole(LocalFrame*, MessageSource, MessageLevel, const String& message, unsigned lineNumber, const String&, const String&) OVERRIDE
     {
 #ifndef NDEBUG
         fprintf(stderr, "CONSOLE MESSSAGE:%u: %s\n", lineNumber, message.utf8().data());
 #endif
     }
 
     virtual void invalidateContentsAndRootView(const IntRect& paintRect) OVERRIDE
     {
         if (paintRect.isEmpty())
             return;
-        m_popup->widgetClient()->didInvalidateRect(paintRect);
+        m_popup->client()->didInvalidateRect(paintRect);
     }
 
     virtual void invalidateContentsForSlowScroll(const IntRect& updateRect) OVERRIDE
     {
         invalidateContentsAndRootView(updateRect);
     }
 
     virtual void scheduleAnimation() OVERRIDE
     {
         if (m_popup->isAcceleratedCompositingActive()) {
             ASSERT(m_popup->m_layerTreeView);
             m_popup->m_layerTreeView->setNeedsAnimate();
             return;
         }
-        m_popup->widgetClient()->scheduleAnimation();
+        m_popup->client()->scheduleAnimation();
     }
 
     virtual WebScreenInfo screenInfo() const OVERRIDE
     {
         return m_popup->m_webView->client() ? m_popup->m_webView->client()->screenInfo() : WebScreenInfo();
     }
 
     virtual void* webView() const OVERRIDE
     {
         return m_popup->m_webView;
     }
 
     virtual FloatSize minimumWindowSize() const OVERRIDE
     {
         return FloatSize(0, 0);
     }
 
     virtual void setCursor(const Cursor& cursor) OVERRIDE
     {
         if (m_popup->m_webView->client())
             m_popup->m_webView->client()->didChangeCursor(WebCursorInfo(cursor));
     }
 
     virtual void needTouchEvents(bool needsTouchEvents) OVERRIDE
     {
-        m_popup->widgetClient()->hasTouchEventHandlers(needsTouchEvents);
+        m_popup->client()->hasTouchEventHandlers(needsTouchEvents);
     }
 
     virtual GraphicsLayerFactory* graphicsLayerFactory() const OVERRIDE
     {
         return m_popup->m_webView->graphicsLayerFactory();
     }
 
     virtual void attachRootGraphicsLayer(GraphicsLayer* graphicsLayer) OVERRIDE
     {
         m_popup->setRootGraphicsLayer(graphicsLayer);
@@ skipping 260 matching lines @@
 
     // m_widgetClient might be 0 because this widget might be already closed.
     if (m_widgetClient) {
         // closeWidgetSoon() will call this->close() later.
         m_widgetClient->closeWidgetSoon();
     }
 
     m_popupClient->didClosePopup();
 }
 
+void WebPagePopupImpl::compositeAndReadbackAsync(WebCompositeAndReadbackAsyncCallback* callback)
+{
+    ASSERT(isAcceleratedCompositingActive());
+    m_layerTreeView->compositeAndReadbackAsync(callback);
+}
+
 // WebPagePopup ----------------------------------------------------------------
 
 WebPagePopup* WebPagePopup::create(WebWidgetClient* client)
 {
     if (!client)
         CRASH();
     // A WebPagePopupImpl instance usually has two references.
     //  - One owned by the instance itself. It represents the visible widget.
     //  - One owned by a WebViewImpl. It's released when the WebViewImpl ask the
     //    WebPagePopupImpl to close.
     // We need them because the closing operation is asynchronous and the widget
     // can be closed while the WebViewImpl is unaware of it.
     return adoptRef(new WebPagePopupImpl(client)).leakRef();
 }
 
 } // namespace blink