Title: [131564] trunk
- Revision
- 131564
- Author
- [email protected]
- Date
- 2012-10-17 01:15:47 -0700 (Wed, 17 Oct 2012)
Log Message
Fix the build with a newer version of clang.
Reviewed by Dan Bernstein.
Source/WebKit/mac:
Some of the methods in WebCoreStatistics appear to have been added by someone not familiar with Objective-C.
While it's technically valid to have empty components in a selector, it's rarely done and is not consistent
with our style guidelines. In this particular case it's also done in such a manner that it's ambiguous and
therefore generates a warning in newer versions of the compiler.
Fixes <rdar://problem/12503709>.
* Misc/WebCoreStatistics.h: Remove unused methods and rename the two poorly-named methods that remain.
* Misc/WebCoreStatistics.mm: Ditto.
(-[WebFrame numberOfPagesWithPageWidth:pageHeight:]):
(-[WebFrame printToCGContext:pageWidth:pageHeight:]):
Tools:
Update to accommodate the renamed methods in WebCoreStatistics.
* DumpRenderTree/mac/PixelDumpSupportMac.mm:
(createPagedBitmapContext):
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (131563 => 131564)
--- trunk/Source/WebKit/mac/ChangeLog 2012-10-17 08:13:20 UTC (rev 131563)
+++ trunk/Source/WebKit/mac/ChangeLog 2012-10-17 08:15:47 UTC (rev 131564)
@@ -1,3 +1,21 @@
+2012-10-17 Mark Rowe <[email protected]>
+
+ Fix the build with a newer version of clang.
+
+ Reviewed by Dan Bernstein.
+
+ Some of the methods in WebCoreStatistics appear to have been added by someone not familiar with Objective-C.
+ While it's technically valid to have empty components in a selector, it's rarely done and is not consistent
+ with our style guidelines. In this particular case it's also done in such a manner that it's ambiguous and
+ therefore generates a warning in newer versions of the compiler.
+
+ Fixes <rdar://problem/12503709>.
+
+ * Misc/WebCoreStatistics.h: Remove unused methods and rename the two poorly-named methods that remain.
+ * Misc/WebCoreStatistics.mm: Ditto.
+ (-[WebFrame numberOfPagesWithPageWidth:pageHeight:]):
+ (-[WebFrame printToCGContext:pageWidth:pageHeight:]):
+
2012-10-16 Jian Li <[email protected]>
Rename feature define ENABLE_WIDGET_REGION to ENABLE_DRAGGBALE_REGION
Modified: trunk/Source/WebKit/mac/Misc/WebCoreStatistics.h (131563 => 131564)
--- trunk/Source/WebKit/mac/Misc/WebCoreStatistics.h 2012-10-17 08:13:20 UTC (rev 131563)
+++ trunk/Source/WebKit/mac/Misc/WebCoreStatistics.h 2012-10-17 08:15:47 UTC (rev 131564)
@@ -85,11 +85,6 @@
@interface WebFrame (WebKitDebug)
- (NSString *)renderTreeAsExternalRepresentationForPrinting:(BOOL)forPrinting;
-- (NSString *)counterValueForElement:(DOMElement*)element;
-- (int)pageNumberForElement:(DOMElement*)element:(float)pageWidthInPixels:(float)pageHeightInPixels;
-- (int)numberOfPages:(float)pageWidthInPixels:(float)pageHeightInPixels;
-- (NSString *)pageProperty:(const char*)propertyName:(int)pageNumber;
-- (bool)isPageBoxVisible:(int)pageNumber;
-- (NSString *)pageSizeAndMarginsInPixels:(int)pageNumber:(int)width:(int)height:(int)marginTop:(int)marginRight:(int)marginBottom:(int)marginLeft;
-- (void)printToCGContext:(CGContextRef)cgContext:(float)pageWidthInPixels:(float)pageHeightInPixels;
+- (int)numberOfPagesWithPageWidth:(float)pageWidthInPixels pageHeight:(float)pageHeightInPixels;
+- (void)printToCGContext:(CGContextRef)cgContext pageWidth:(float)pageWidthInPixels pageHeight:(float)pageHeightInPixels;
@end
Modified: trunk/Source/WebKit/mac/Misc/WebCoreStatistics.mm (131563 => 131564)
--- trunk/Source/WebKit/mac/Misc/WebCoreStatistics.mm 2012-10-17 08:13:20 UTC (rev 131563)
+++ trunk/Source/WebKit/mac/Misc/WebCoreStatistics.mm 2012-10-17 08:15:47 UTC (rev 131564)
@@ -273,38 +273,13 @@
return externalRepresentation(_private->coreFrame, forPrinting ? RenderAsTextPrintingMode : RenderAsTextBehaviorNormal);
}
-- (NSString *)counterValueForElement:(DOMElement*)element
+- (int)numberOfPagesWithPageWidth:(float)pageWidthInPixels pageHeight:(float)pageHeightInPixels
{
- return counterValueForElement(core(element));
-}
-
-- (int)pageNumberForElement:(DOMElement*)element:(float)pageWidthInPixels:(float)pageHeightInPixels
-{
- return PrintContext::pageNumberForElement(core(element), FloatSize(pageWidthInPixels, pageHeightInPixels));
-}
-
-- (int)numberOfPages:(float)pageWidthInPixels:(float)pageHeightInPixels
-{
return PrintContext::numberOfPages(_private->coreFrame, FloatSize(pageWidthInPixels, pageHeightInPixels));
}
-- (NSString *)pageProperty:(const char *)propertyName:(int)pageNumber
+- (void)printToCGContext:(CGContextRef)cgContext pageWidth:(float)pageWidthInPixels pageHeight:(float)pageHeightInPixels
{
- return PrintContext::pageProperty(_private->coreFrame, propertyName, pageNumber);
-}
-
-- (bool)isPageBoxVisible:(int)pageNumber
-{
- return PrintContext::isPageBoxVisible(_private->coreFrame, pageNumber);
-}
-
-- (NSString *)pageSizeAndMarginsInPixels:(int)pageNumber:(int)width:(int)height:(int)marginTop:(int)marginRight:(int)marginBottom:(int)marginLeft
-{
- return PrintContext::pageSizeAndMarginsInPixels(_private->coreFrame, pageNumber, width, height, marginTop, marginRight, marginBottom, marginLeft);
-}
-
-- (void)printToCGContext:(CGContextRef)cgContext:(float)pageWidthInPixels:(float)pageHeightInPixels
-{
Frame* coreFrame = _private->coreFrame;
if (!coreFrame)
return;
Modified: trunk/Tools/ChangeLog (131563 => 131564)
--- trunk/Tools/ChangeLog 2012-10-17 08:13:20 UTC (rev 131563)
+++ trunk/Tools/ChangeLog 2012-10-17 08:15:47 UTC (rev 131564)
@@ -1,3 +1,14 @@
+2012-10-17 Mark Rowe <[email protected]>
+
+ Fix the build with a newer version of clang.
+
+ Reviewed by Dan Bernstein.
+
+ Update to accommodate the renamed methods in WebCoreStatistics.
+
+ * DumpRenderTree/mac/PixelDumpSupportMac.mm:
+ (createPagedBitmapContext):
+
2012-10-17 Mikhail Pozdnyakov <[email protected]>
WebKitTestRunner needs testRunner.queueLoad
Modified: trunk/Tools/DumpRenderTree/mac/PixelDumpSupportMac.mm (131563 => 131564)
--- trunk/Tools/DumpRenderTree/mac/PixelDumpSupportMac.mm 2012-10-17 08:13:20 UTC (rev 131563)
+++ trunk/Tools/DumpRenderTree/mac/PixelDumpSupportMac.mm 2012-10-17 08:15:47 UTC (rev 131564)
@@ -186,11 +186,11 @@
{
int pageWidthInPixels = TestRunner::maxViewWidth;
int pageHeightInPixels = TestRunner::maxViewHeight;
- int numberOfPages = [mainFrame numberOfPages:pageWidthInPixels:pageHeightInPixels];
+ int numberOfPages = [mainFrame numberOfPagesWithPageWidth:pageWidthInPixels pageHeight:pageHeightInPixels];
size_t rowBytes = 0;
void* buffer = 0;
RefPtr<BitmapContext> bitmapContext = createBitmapContext(pageWidthInPixels, numberOfPages * (pageHeightInPixels + 1) - 1, rowBytes, buffer);
- [mainFrame printToCGContext:bitmapContext->cgContext():pageWidthInPixels:pageHeightInPixels];
+ [mainFrame printToCGContext:bitmapContext->cgContext() pageWidth:pageWidthInPixels pageHeight:pageHeightInPixels];
return bitmapContext.release();
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
