Add pixel readback to page popup

Source/web/WebPagePopupImpl.cpp

Index: Source/web/WebPagePopupImpl.cpp
diff --git a/Source/web/WebPagePopupImpl.cpp b/Source/web/WebPagePopupImpl.cpp
index a199ba4258e31045086305614abb9208082cd6cc..81f75c1986c2344d5f1d6308d5372a55eb9ab42f 100644
--- a/Source/web/WebPagePopupImpl.cpp
+++ b/Source/web/WebPagePopupImpl.cpp
@@ -44,6 +44,7 @@
 #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"
@@ -64,7 +65,7 @@ public:
     explicit PagePopupChromeClient(WebPagePopupImpl* popup)
         : m_popup(popup)
     {
-        ASSERT(m_popup->widgetClient());
+        ASSERT(m_popup->client());
     }
 
 private:
@@ -81,7 +82,7 @@ private:
     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
@@ -102,7 +103,7 @@ private:
     {
         if (paintRect.isEmpty())
             return;
-        m_popup->widgetClient()->didInvalidateRect(paintRect);
+        m_popup->client()->didInvalidateRect(paintRect);
     }
 
     virtual void invalidateContentsForSlowScroll(const IntRect& updateRect) OVERRIDE
@@ -117,7 +118,7 @@ private:
             m_popup->m_layerTreeView->setNeedsAnimate();
             return;
         }
-        m_popup->widgetClient()->scheduleAnimation();
+        m_popup->client()->scheduleAnimation();
     }
 
     virtual WebScreenInfo screenInfo() const OVERRIDE
@@ -143,7 +144,7 @@ private:
 
     virtual void needTouchEvents(bool needsTouchEvents) OVERRIDE
     {
-        m_popup->widgetClient()->hasTouchEventHandlers(needsTouchEvents);
+        m_popup->client()->hasTouchEventHandlers(needsTouchEvents);
     }
 
     virtual GraphicsLayerFactory* graphicsLayerFactory() const OVERRIDE
@@ -424,6 +425,12 @@ void WebPagePopupImpl::closePopup()
     m_popupClient->didClosePopup();
 }
 
+void WebPagePopupImpl::compositeAndReadbackAsync(WebCompositeAndReadbackAsyncCallback* callback)
+{
+    ASSERT(isAcceleratedCompositingActive());
+    m_layerTreeView->compositeAndReadbackAsync(callback);
+}
+
 // WebPagePopup ----------------------------------------------------------------
 
 WebPagePopup* WebPagePopup::create(WebWidgetClient* client)