diff options
| author | Steve Block <steveblock@google.com> | 2010-07-08 12:51:48 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-07-09 15:33:40 +0100 |
| commit | ca9cb53ed1119a3fd98fafa0972ffeb56dee1c24 (patch) | |
| tree | bb45155550ec013adc0ad10f4d7d354c6469b022 /WebKit/mac/Misc | |
| parent | d4b24d9a829ed7de70381c8b99fb75a07ab40466 (diff) | |
| download | external_webkit-ca9cb53ed1119a3fd98fafa0972ffeb56dee1c24.zip external_webkit-ca9cb53ed1119a3fd98fafa0972ffeb56dee1c24.tar.gz external_webkit-ca9cb53ed1119a3fd98fafa0972ffeb56dee1c24.tar.bz2 | |
Merge WebKit at r62496: Initial merge by git
Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
Diffstat (limited to 'WebKit/mac/Misc')
| -rw-r--r-- | WebKit/mac/Misc/WebCoreStatistics.h | 3 | ||||
| -rw-r--r-- | WebKit/mac/Misc/WebCoreStatistics.mm | 9 |
2 files changed, 3 insertions, 9 deletions
diff --git a/WebKit/mac/Misc/WebCoreStatistics.h b/WebKit/mac/Misc/WebCoreStatistics.h index e357b72..33e3e0f 100644 --- a/WebKit/mac/Misc/WebCoreStatistics.h +++ b/WebKit/mac/Misc/WebCoreStatistics.h @@ -89,6 +89,5 @@ - (int)numberOfPages:(float)pageWidthInPixels:(float)pageHeightInPixels; - (NSString *)pageProperty:(const char*)propertyName:(int)pageNumber; - (bool)isPageBoxVisible:(int)pageNumber; -- (NSString *)pageAreaRectInPixels:(int)pageNumber; -- (NSString *)preferredPageSizeInPixels:(int)pageNumber; +- (NSString *)pageSizeAndMarginsInPixels:(int)pageNumber:(int)width:(int)height:(int)marginTop:(int)marginRight:(int)marginBottom:(int)marginLeft; @end diff --git a/WebKit/mac/Misc/WebCoreStatistics.mm b/WebKit/mac/Misc/WebCoreStatistics.mm index 9112d21..bbe07d5 100644 --- a/WebKit/mac/Misc/WebCoreStatistics.mm +++ b/WebKit/mac/Misc/WebCoreStatistics.mm @@ -285,13 +285,8 @@ using namespace WebCore; return PrintContext::isPageBoxVisible(_private->coreFrame, pageNumber); } -- (NSString *)pageAreaRectInPixels:(int)pageNumber +- (NSString *)pageSizeAndMarginsInPixels:(int)pageNumber:(int)width:(int)height:(int)marginTop:(int)marginRight:(int)marginBottom:(int)marginLeft { - return PrintContext::pageAreaRectInPixels(_private->coreFrame, pageNumber); -} - -- (NSString *)preferredPageSizeInPixels:(int)pageNumber; -{ - return PrintContext::preferredPageSizeInPixels(_private->coreFrame, pageNumber); + return PrintContext::pageSizeAndMarginsInPixels(_private->coreFrame, pageNumber, width, height, marginTop, marginRight, marginBottom, marginLeft); } @end |