diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /Source/WebKit2/UIProcess/DrawingAreaProxy.cpp | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebKit2/UIProcess/DrawingAreaProxy.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/DrawingAreaProxy.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp b/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp index 900d6a588..4d49d816c 100644 --- a/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp +++ b/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp @@ -26,34 +26,40 @@ #include "config.h" #include "DrawingAreaProxy.h" +#include "DrawingAreaProxyMessages.h" #include "WebPageProxy.h" +#include "WebProcessProxy.h" #if USE(COORDINATED_GRAPHICS) -#include "LayerTreeCoordinatorProxy.h" -#include <CoreIPC/MessageID.h> +#include "CoordinatedLayerTreeHostProxy.h" #endif using namespace WebCore; namespace WebKit { +const double DrawingAreaProxy::didUpdateBackingStoreStateTimeout = 0.5; + DrawingAreaProxy::DrawingAreaProxy(DrawingAreaType type, WebPageProxy* webPageProxy) : m_type(type) , m_webPageProxy(webPageProxy) , m_size(webPageProxy->viewSize()) { + m_webPageProxy->process()->addMessageReceiver(Messages::DrawingAreaProxy::messageReceiverName(), webPageProxy->pageID(), this); } DrawingAreaProxy::~DrawingAreaProxy() { + m_webPageProxy->process()->removeMessageReceiver(Messages::DrawingAreaProxy::messageReceiverName(), m_webPageProxy->pageID()); } -void DrawingAreaProxy::setSize(const IntSize& size, const IntSize& scrollOffset) +void DrawingAreaProxy::setSize(const IntSize& size, const IntSize& layerPosition, const IntSize& scrollOffset) { - if (m_size == size && scrollOffset.isZero()) + if (m_size == size && m_layerPosition == layerPosition && scrollOffset.isZero()) return; m_size = size; + m_layerPosition = layerPosition; m_scrollOffset += scrollOffset; sizeDidChange(); } @@ -68,10 +74,6 @@ WebCore::IntRect DrawingAreaProxy::contentsRect() const { return IntRect(IntPoint::zero(), m_webPageProxy->viewSize()); } - -void DrawingAreaProxy::didReceiveLayerTreeCoordinatorProxyMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) -{ -} #endif } // namespace WebKit |