From 5e2bc6953fe6923165b8a5d7679939693a1d58d6 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Fri, 5 Feb 2010 14:27:46 +0000 Subject: Merge webkit.org at r54340 : Initial merge by git Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44 --- WebCore/page/win/FrameWin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'WebCore/page/win/FrameWin.h') diff --git a/WebCore/page/win/FrameWin.h b/WebCore/page/win/FrameWin.h index 9cf9683..4c274b7 100644 --- a/WebCore/page/win/FrameWin.h +++ b/WebCore/page/win/FrameWin.h @@ -37,7 +37,7 @@ namespace WebCore { class IntRect; HBITMAP imageFromSelection(Frame* frame, bool forceWhiteText); - void computePageRectsForFrame(Frame*, const IntRect& printRect, float headerHeight, float footerHeight, float userScaleFactor, Vector& pages, int& pageHeight); + void computePageRectsForFrame(Frame*, const IntRect& printRect, float headerHeight, float footerHeight, float userScaleFactor, Vector& outPages, int& outPageHeight); } -- cgit v1.1