From d441d6f39bb846989d95bcf5caf387b42414718d Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 13 Sep 2013 12:51:20 +0200 Subject: Import Qt5x2 branch of QtWebkit for Qt 5.2 Importing a new snapshot of webkit. Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c Reviewed-by: Allan Sandfeld Jensen --- Source/WebKit2/Shared/qt/LayerTreeContextQt.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Source/WebKit2/Shared/qt/LayerTreeContextQt.cpp') diff --git a/Source/WebKit2/Shared/qt/LayerTreeContextQt.cpp b/Source/WebKit2/Shared/qt/LayerTreeContextQt.cpp index 00ea8735f..a2f01f953 100644 --- a/Source/WebKit2/Shared/qt/LayerTreeContextQt.cpp +++ b/Source/WebKit2/Shared/qt/LayerTreeContextQt.cpp @@ -32,7 +32,7 @@ namespace WebKit { LayerTreeContext::LayerTreeContext() - : webLayerID(0) + : coordinatedLayerID(0) { } @@ -42,22 +42,22 @@ LayerTreeContext::~LayerTreeContext() void LayerTreeContext::encode(CoreIPC::ArgumentEncoder& encoder) const { - encoder.encode(webLayerID); + encoder << coordinatedLayerID; } -bool LayerTreeContext::decode(CoreIPC::ArgumentDecoder* decoder, LayerTreeContext& context) +bool LayerTreeContext::decode(CoreIPC::ArgumentDecoder& decoder, LayerTreeContext& context) { - return decoder->decode(context.webLayerID); + return decoder.decode(context.coordinatedLayerID); } bool LayerTreeContext::isEmpty() const { - return !webLayerID; + return !coordinatedLayerID; } bool operator==(const LayerTreeContext& a, const LayerTreeContext& b) { - return a.webLayerID == b.webLayerID; + return a.coordinatedLayerID == b.coordinatedLayerID; } } // namespace WebKit -- cgit v1.2.1