From 2bde8e466a4451c7319e3a072d118917957d6554 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 25 May 2011 19:08:45 +0100 Subject: Merge WebKit at r82507: Initial merge by git Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e --- Source/WebKit2/Shared/WebPageCreationParameters.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Source/WebKit2/Shared/WebPageCreationParameters.cpp') diff --git a/Source/WebKit2/Shared/WebPageCreationParameters.cpp b/Source/WebKit2/Shared/WebPageCreationParameters.cpp index 33b53e3..c5dff58 100644 --- a/Source/WebKit2/Shared/WebPageCreationParameters.cpp +++ b/Source/WebKit2/Shared/WebPageCreationParameters.cpp @@ -51,6 +51,7 @@ void WebPageCreationParameters::encode(CoreIPC::ArgumentEncoder* encoder) const encoder->encode(highestUsedBackForwardItemID); encoder->encode(canRunBeforeUnloadConfirmPanel); encoder->encode(canRunModal); + encoder->encode(userSpaceScaleFactor); #if PLATFORM(MAC) encoder->encode(isSmartInsertDeleteEnabled); @@ -99,6 +100,8 @@ bool WebPageCreationParameters::decode(CoreIPC::ArgumentDecoder* decoder, WebPag return false; if (!decoder->decode(parameters.canRunModal)) return false; + if (!decoder->decode(parameters.userSpaceScaleFactor)) + return false; #if PLATFORM(MAC) if (!decoder->decode(parameters.isSmartInsertDeleteEnabled)) -- cgit v1.1