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/WebCore/page/PrintContext.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/WebCore/page/PrintContext.cpp') diff --git a/Source/WebCore/page/PrintContext.cpp b/Source/WebCore/page/PrintContext.cpp index da29f0e..6c8b312 100644 --- a/Source/WebCore/page/PrintContext.cpp +++ b/Source/WebCore/page/PrintContext.cpp @@ -282,16 +282,16 @@ String PrintContext::pageProperty(Frame* frame, const char* propertyName, int pa if (!strcmp(propertyName, "margin-left")) { if (style->marginLeft().isAuto()) return String("auto"); - return String::number(style->marginLeft().rawValue()); + return String::number(style->marginLeft().value()); } if (!strcmp(propertyName, "line-height")) - return String::number(style->lineHeight().rawValue()); + return String::number(style->lineHeight().value()); if (!strcmp(propertyName, "font-size")) return String::number(style->fontDescription().computedPixelSize()); if (!strcmp(propertyName, "font-family")) return style->fontDescription().family().family().string(); if (!strcmp(propertyName, "size")) - return makeString(String::number(style->pageSize().width().rawValue()), ' ', String::number(style->pageSize().height().rawValue())); + return makeString(String::number(style->pageSize().width().value()), ' ', String::number(style->pageSize().height().value())); return makeString("pageProperty() unimplemented for: ", propertyName); } -- cgit v1.1