Eliminate the WebCGFloat compatibility definition that was needed for Tiger.
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 17 Aug 2011 23:37:03 +0000 (23:37 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 17 Aug 2011 23:37:03 +0000 (23:37 +0000)
Rubber-stamped by Anders Carlsson.

* WebView/WebHTMLViewPrivate.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@93261 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebView/WebHTMLViewPrivate.h

index 80d579c3a95d4aa198944947177f368094dd5cd3..278198365dd74b8ba3accd817eea2d0ebc5b0b93 100644 (file)
@@ -1,3 +1,11 @@
+2011-08-17  Dan Bernstein  <mitz@apple.com>
+
+        Eliminate the WebCGFloat compatibility definition that was needed for Tiger.
+
+        Rubber-stamped by Anders Carlsson.
+
+        * WebView/WebHTMLViewPrivate.h:
+
 2011-08-17  Dan Bernstein  <mitz@apple.com>
 
         Eliminate the WebNSInteger and WebNSUInteger compatibility definitions that were
index 9ee807d454916421bde83bf496d93a711479d69b..1c5625a53a8356957ac4358599bdb65187db1a0b 100644 (file)
 #define ENABLE_NETSCAPE_PLUGIN_API 1
 #endif
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4
-#define WebCGFloat float
-#else
-#define WebCGFloat CGFloat
-#endif
-
 @class DOMDocumentFragment;
 @class DOMNode;
 @class DOMRange;
@@ -127,12 +121,12 @@ extern const float _WebHTMLViewPrintingMaximumShrinkFactor;
 // directly, this method must be called before paginating, or the computed height might be incorrect.
 // Typically this would be called from inside an override of -[NSView knowsPageRange:].
 - (void)_layoutForPrinting;
-- (WebCGFloat)_adjustedBottomOfPageWithTop:(WebCGFloat)top bottom:(WebCGFloat)bottom limit:(WebCGFloat)bottomLimit;
+- (CGFloat)_adjustedBottomOfPageWithTop:(CGFloat)top bottom:(CGFloat)bottom limit:(CGFloat)bottomLimit;
 - (BOOL)_isInPrintMode;
 - (BOOL)_beginPrintModeWithPageWidth:(float)pageWidth height:(float)pageHeight shrinkToFit:(BOOL)shrinkToFit;
 // Lays out to pages of the given minimum width and height or more (increasing both dimensions proportionally)
 // as needed for the content to fit, but no more than the given maximum width.
-- (BOOL)_beginPrintModeWithMinimumPageWidth:(WebCGFloat)minimumPageWidth height:(WebCGFloat)minimumPageHeight maximumPageWidth:(WebCGFloat)maximumPageWidth;
+- (BOOL)_beginPrintModeWithMinimumPageWidth:(CGFloat)minimumPageWidth height:(CGFloat)minimumPageHeight maximumPageWidth:(CGFloat)maximumPageWidth;
 - (void)_endPrintMode;
 
 - (BOOL)_isInScreenPaginationMode;
@@ -142,5 +136,3 @@ extern const float _WebHTMLViewPrintingMaximumShrinkFactor;
 - (BOOL)_canSmartReplaceWithPasteboard:(NSPasteboard *)pasteboard;
 
 @end
-
-#undef WebCGFloat