[webkit-changes] cvs commit: WebKit/WebView.subproj WebDataSource.m
WebDefaultContextMenuDelegate.m WebFormDataStream.m
WebFrameView.m WebHTMLView.m WebPDFRepresentation.h
WebPDFRepresentation.m WebPDFView.h WebPDFView.m
WebPreferences.m WebView.m
Darin
darin at opensource.apple.com
Tue Aug 16 12:03:40 PDT 2005
darin 05/08/16 12:03:40
Modified: . ChangeLog WebCorePrefix.h
khtml/misc loader.cpp
khtml/rendering render_canvasimage.cpp
kwq KWQAccObject.mm KWQComboBox.mm
KWQFoundationExtras.h KWQPixmap.mm KWQString.h
KWQTextArea.mm KWQTextEdit.mm KWQTextField.mm
KWQTextUtilities.mm WebCoreScrollView.m
. ChangeLog WebKitPrefix.h
Misc.subproj WebFileDatabase.m WebKitErrors.m
WebNSObjectExtras.h WebNSPasteboardExtras.m
WebCoreSupport.subproj WebImageData.h WebImageDecodeItem.h
WebImageDecodeItem.m WebImageDecoder.h
WebImageDecoder.m WebKeyGenerator.h
WebTextRenderer.m WebViewFactory.m
WebKit.xcodeproj project.pbxproj
WebView.subproj WebDataSource.m
WebDefaultContextMenuDelegate.m WebFormDataStream.m
WebFrameView.m WebHTMLView.m WebPDFRepresentation.h
WebPDFRepresentation.m WebPDFView.h WebPDFView.m
WebPreferences.m WebView.m
Removed: WebCoreSupport.subproj WebKeyGeneration.cpp
WebKeyGeneration.h
Log:
WebCore:
Reviewed by Beth Dakin.
- removed Panther-only code that was not being compiled and was
simply "bit-rotting"
* WebCorePrefix.h:
* khtml/misc/loader.cpp:
(CachedImage::CachedImage):
* khtml/rendering/render_canvasimage.cpp:
* kwq/KWQAccObject.mm:
(-[KWQAccObject roleDescription]):
(-[KWQAccObject accessibilityAttributeNames]):
(-[KWQAccObject accessibilityActionDescription:]):
(-[KWQAccObject accessibilityAttributeValue:]):
(-[KWQAccObject accessibilityIsAttributeSettable:]):
* kwq/KWQComboBox.mm:
(QComboBox::QComboBox):
* kwq/KWQFoundationExtras.h:
(KWQCFAutorelease):
* kwq/KWQPixmap.mm:
(QPixmap::QPixmap):
(QPixmap::receivedData):
* kwq/KWQString.h:
(QChar::direction):
* kwq/KWQTextArea.mm:
(-[KWQTextArea tile]):
* kwq/KWQTextEdit.mm:
(QTextEdit::setScrollBarModes):
* kwq/KWQTextField.mm:
(-[KWQTextFieldController string]):
* kwq/KWQTextUtilities.mm:
(currentTextBreakLocaleID):
* kwq/WebCoreScrollView.m:
WebKit:
Reviewed by Beth Dakin.
- removed Panther-only code that was not being compiled and was
simply "bit-rotting"
* Misc.subproj/WebFileDatabase.m:
(-[WebFileDatabase _createLRUList:]):
(+[WebFileDatabase _syncLoop:]):
* Misc.subproj/WebKitErrors.m:
(registerErrors):
* Misc.subproj/WebNSObjectExtras.h:
(WebCFAutorelease):
* Misc.subproj/WebNSPasteboardExtras.m:
(-[NSPasteboard _web_declareAndWriteDragImage:URL:title:archive:source:]):
* WebCoreSupport.subproj/WebImageData.h:
* WebCoreSupport.subproj/WebImageDecodeItem.h:
* WebCoreSupport.subproj/WebImageDecodeItem.m:
* WebCoreSupport.subproj/WebImageDecoder.h:
* WebCoreSupport.subproj/WebImageDecoder.m:
(decoderThread):
(startDecoderThread):
* WebCoreSupport.subproj/WebKeyGeneration.cpp: Removed.
* WebCoreSupport.subproj/WebKeyGeneration.h: Removed.
* WebCoreSupport.subproj/WebKeyGenerator.h:
* WebCoreSupport.subproj/WebTextRenderer.m:
(getUncachedWidth):
(_drawGlyphs):
* WebCoreSupport.subproj/WebViewFactory.m:
(-[WebViewFactory getBytes:fromTextMarker:length:]):
* WebKit.xcodeproj/project.pbxproj:
* WebKitPrefix.h:
* WebView.subproj/WebDataSource.m:
(-[WebDataSource _setPrimaryLoadComplete:]):
(+[WebDataSource _repTypesAllowImageTypeOmission:]):
(-[WebDataSource isLoading]):
* WebView.subproj/WebDefaultContextMenuDelegate.m:
(localizedMenuTitleFromAppKit):
(-[WebDefaultUIDelegate menuItemWithTag:]):
(-[WebDefaultUIDelegate contextMenuItemsForElement:defaultMenuItems:]):
(-[WebDefaultUIDelegate editingContextMenuItemsForElement:defaultMenuItems:]):
* WebView.subproj/WebFormDataStream.m:
(formCanRead):
(webSetHTTPBody):
* WebView.subproj/WebFrameView.m:
(+[WebFrameView _viewTypesAllowImageTypeOmission:]):
* WebView.subproj/WebHTMLView.m:
(-[WebHTMLView _documentFragmentFromPasteboard:allowPlainText:chosePlainText:]):
(-[WebHTMLView resourceForData:preferredFilename:]):
(-[WebHTMLView _lookUpInDictionaryFromMenu:]):
(-[WebHTMLView validateUserInterfaceItem:]):
(-[WebHTMLView _attributeStringFromDOMRange:]):
(-[WebHTMLView toggleBaseWritingDirection:]):
(-[WebHTMLView changeBaseWritingDirection:]):
* WebView.subproj/WebPDFRepresentation.h:
* WebView.subproj/WebPDFRepresentation.m:
* WebView.subproj/WebPDFView.h:
* WebView.subproj/WebPDFView.m:
* WebView.subproj/WebPreferences.m:
(+[WebPreferences _systemCFStringEncoding]):
* WebView.subproj/WebView.m:
(-[WebView _commonInitializationWithFrameName:groupName:]):
Revision Changes Path
1.4587 +36 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.4586
retrieving revision 1.4587
diff -u -r1.4586 -r1.4587
--- ChangeLog 16 Aug 2005 18:28:56 -0000 1.4586
+++ ChangeLog 16 Aug 2005 19:03:06 -0000 1.4587
@@ -2,6 +2,42 @@
Reviewed by Beth Dakin.
+ - removed Panther-only code that was not being compiled and was
+ simply "bit-rotting"
+
+ * WebCorePrefix.h:
+ * khtml/misc/loader.cpp:
+ (CachedImage::CachedImage):
+ * khtml/rendering/render_canvasimage.cpp:
+ * kwq/KWQAccObject.mm:
+ (-[KWQAccObject roleDescription]):
+ (-[KWQAccObject accessibilityAttributeNames]):
+ (-[KWQAccObject accessibilityActionDescription:]):
+ (-[KWQAccObject accessibilityAttributeValue:]):
+ (-[KWQAccObject accessibilityIsAttributeSettable:]):
+ * kwq/KWQComboBox.mm:
+ (QComboBox::QComboBox):
+ * kwq/KWQFoundationExtras.h:
+ (KWQCFAutorelease):
+ * kwq/KWQPixmap.mm:
+ (QPixmap::QPixmap):
+ (QPixmap::receivedData):
+ * kwq/KWQString.h:
+ (QChar::direction):
+ * kwq/KWQTextArea.mm:
+ (-[KWQTextArea tile]):
+ * kwq/KWQTextEdit.mm:
+ (QTextEdit::setScrollBarModes):
+ * kwq/KWQTextField.mm:
+ (-[KWQTextFieldController string]):
+ * kwq/KWQTextUtilities.mm:
+ (currentTextBreakLocaleID):
+ * kwq/WebCoreScrollView.m:
+
+2005-08-16 Darin Adler <darin at apple.com>
+
+ Reviewed by Beth Dakin.
+
- removed some unnecessary code
* kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::imageFromRect): Remove code to call
1.15 +0 -9 WebCore/WebCorePrefix.h
Index: WebCorePrefix.h
===================================================================
RCS file: /cvs/root/WebCore/WebCorePrefix.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- WebCorePrefix.h 28 Oct 2004 23:14:40 -0000 1.14
+++ WebCorePrefix.h 16 Aug 2005 19:03:11 -0000 1.15
@@ -60,15 +60,6 @@
#include <CoreServices/CoreServices.h>
#define KHTML_NO_XBL 1
-
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3
-#define BUILDING_ON_PANTHER 1
-#endif
-
-#if BUILDING_ON_PANTHER
-#define OMIT_TIGER_FEATURES 1
-#endif
-
#define KHTML_XSLT 1
#ifdef __OBJC__
1.72 +0 -4 WebCore/khtml/misc/loader.cpp
Index: loader.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/misc/loader.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- loader.cpp 1 Aug 2005 04:31:57 -0000 1.71
+++ loader.cpp 16 Aug 2005 19:03:18 -0000 1.72
@@ -619,15 +619,11 @@
#endif
m_showAnimations = dl->showAnimations();
#if APPLE_CHANGES
-#if BUILDING_ON_PANTHER
- m_decoderCallback = 0;
-#else
if (QPixmap::shouldUseThreadedDecoding())
m_decoderCallback = new CachedImageCallback(this);
else
m_decoderCallback = 0;
#endif
-#endif
}
CachedImage::~CachedImage()
1.19 +0 -9 WebCore/khtml/rendering/render_canvasimage.cpp
Index: render_canvasimage.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_canvasimage.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- render_canvasimage.cpp 1 Aug 2005 09:06:33 -0000 1.18
+++ render_canvasimage.cpp 16 Aug 2005 19:03:18 -0000 1.19
@@ -47,15 +47,6 @@
// isnan are not defined.
#include <cmath>
-
-
-// To be public in Tiger. Test on tiger and add conditional.
-#if BUILDING_ON_PANTHER
-CG_EXTERN_C_BEGIN
-CG_EXTERN CGImageRef CGBitmapContextCreateImage(CGContextRef c);
-CG_EXTERN_C_END
-#endif
-
using namespace DOM;
using namespace HTMLNames;
using namespace khtml;
1.76 +2 -52 WebCore/kwq/KWQAccObject.mm
Index: KWQAccObject.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQAccObject.mm,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- KWQAccObject.mm 8 Aug 2005 21:12:01 -0000 1.75
+++ KWQAccObject.mm 16 Aug 2005 19:03:18 -0000 1.76
@@ -97,13 +97,6 @@
using khtml::TextIterator;
using khtml::VisiblePosition;
-/* NSAccessibilityDescriptionAttribute is only defined on 10.4 and newer */
-#if BUILDING_ON_PANTHER
-#define ACCESSIBILITY_DESCRIPTION_ATTRIBUTE @"AXDescription"
-#else
-#define ACCESSIBILITY_DESCRIPTION_ATTRIBUTE NSAccessibilityDescriptionAttribute
-#endif
-
// FIXME: This will eventually need to really localize.
#define UI_STRING(string, comment) ((NSString *)[NSString stringWithUTF8String:(string)])
@@ -412,12 +405,6 @@
-(NSString*)roleDescription
{
-#if OMIT_TIGER_FEATURES
- // We don't need role descriptions on Panther and we don't have the call
- // to get at localized ones anyway. At some point we may want to conditionally
- // compile this entire file instead, but this is OK too.
- return nil;
-#else
if (!m_renderer)
return nil;
@@ -461,7 +448,6 @@
return UI_STRING("image map", "accessibility role description for image map");
return NSAccessibilityRoleDescription(NSAccessibilityUnknownRole, nil);
-#endif
}
-(NSString*)helpText
@@ -677,18 +663,14 @@
NSAccessibilityPositionAttribute,
NSAccessibilitySizeAttribute,
NSAccessibilityTitleAttribute,
- ACCESSIBILITY_DESCRIPTION_ATTRIBUTE,
+ NSAccessibilityDescriptionAttribute,
NSAccessibilityValueAttribute,
NSAccessibilityFocusedAttribute,
NSAccessibilityEnabledAttribute,
NSAccessibilityWindowAttribute,
-#if OMIT_TIGER_FEATURES
-// no parameterized attributes in Panther... they were introduced in Tiger
-#else
@"AXSelectedTextMarkerRange",
@"AXStartTextMarker",
@"AXEndTextMarker",
-#endif
nil];
}
if (anchorAttrs == nil) {
@@ -705,13 +687,9 @@
NSAccessibilityEnabledAttribute,
NSAccessibilityWindowAttribute,
@"AXURL",
-#if OMIT_TIGER_FEATURES
-// no parameterized attributes in Panther... they were introduced in Tiger
-#else
@"AXSelectedTextMarkerRange",
@"AXStartTextMarker",
@"AXEndTextMarker",
-#endif
nil];
}
if (webAreaAttrs == nil) {
@@ -730,13 +708,9 @@
@"AXLinkUIElements",
@"AXLoaded",
@"AXLayoutCount",
-#if OMIT_TIGER_FEATURES
-// no parameterized attributes in Panther... they were introduced in Tiger
-#else
@"AXSelectedTextMarkerRange",
@"AXStartTextMarker",
@"AXEndTextMarker",
-#endif
nil];
}
@@ -761,15 +735,8 @@
- (NSString *)accessibilityActionDescription:(NSString *)action
{
-#if OMIT_TIGER_FEATURES
- // We don't need action descriptions on Panther and we don't have the call
- // to get at localized ones anyway. At some point we may want to conditionally
- // compile this entire file instead, but this is OK too.
- return nil;
-#else
// we have no custom actions
return NSAccessibilityActionDescription(action);
-#endif
}
- (void)accessibilityPerformAction:(NSString *)action
@@ -920,7 +887,7 @@
if ([attributeName isEqualToString: NSAccessibilityTitleAttribute])
return [self title];
- if ([attributeName isEqualToString: ACCESSIBILITY_DESCRIPTION_ATTRIBUTE])
+ if ([attributeName isEqualToString: NSAccessibilityDescriptionAttribute])
return [self accessibilityDescription];
if ([attributeName isEqualToString: NSAccessibilityValueAttribute])
@@ -947,9 +914,6 @@
return nil;
}
-#if OMIT_TIGER_FEATURES
-// no parameterized attributes in Panther... they were introduced in Tiger
-#else
if ([attributeName isEqualToString: @"AXSelectedTextMarkerRange"]) {
// get the selection from the document part
// NOTE: BUG support nested WebAreas, like in <http://webcourses.niu.edu/>
@@ -979,14 +943,10 @@
VisiblePosition endPos = [self topRenderer]->positionForCoordinates (LONG_MAX, LONG_MAX);
return (id) [self textMarkerForVisiblePosition: endPos];
}
-#endif
return nil;
}
-#if OMIT_TIGER_FEATURES
-// no parameterized attributes in Panther... they were introduced in Tiger
-#else
- (NSArray *)accessibilityParameterizedAttributeNames
{
static NSArray* paramAttributes = nil;
@@ -1834,8 +1794,6 @@
return nil;
}
-#endif
-
- (id)accessibilityHitTest:(NSPoint)point
{
if (!m_renderer)
@@ -1915,9 +1873,6 @@
- (BOOL)accessibilityIsAttributeSettable:(NSString*)attributeName
{
-#if OMIT_TIGER_FEATURES
-// no parameterized attributes in Panther... they were introduced in Tiger
-#else
if ([attributeName isEqualToString: @"AXSelectedTextMarkerRangeAttribute"])
return YES;
if ([attributeName isEqualToString: NSAccessibilityFocusedAttribute]) {
@@ -1927,14 +1882,10 @@
m_renderer->element()->isEnabled()))
return YES;
}
-#endif
return NO;
}
-#if OMIT_TIGER_FEATURES
-// no parameterized attributes in Panther... they were introduced in Tiger
-#else
- (void)doSetAXSelectedTextMarkerRange: (WebCoreTextMarkerRange *)textMarkerRange
{
// extract the start and end VisiblePosition
@@ -1982,7 +1933,6 @@
}
}
}
-#endif
- (void)childrenChanged
{
1.63 +0 -2 WebCore/kwq/KWQComboBox.mm
Index: KWQComboBox.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQComboBox.mm,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- KWQComboBox.mm 25 Jul 2005 23:13:31 -0000 1.62
+++ KWQComboBox.mm 16 Aug 2005 19:03:19 -0000 1.63
@@ -84,11 +84,9 @@
[button release];
KWQPopUpButtonCell *cell = [[KWQPopUpButtonCell alloc] initWithQComboBox:this];
-#ifndef OMIT_TIGER_FEATURES
// Work around problem where the pop-up menu gets a "..." in it
// by turning off the default "ellipsizing" behavior.
[cell setLineBreakMode:NSLineBreakByClipping];
-#endif
[button setCell:cell];
[cell release];
1.10 +2 -14 WebCore/kwq/KWQFoundationExtras.h
Index: KWQFoundationExtras.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQFoundationExtras.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- KWQFoundationExtras.h 19 Dec 2004 20:35:38 -0000 1.9
+++ KWQFoundationExtras.h 16 Aug 2005 19:03:19 -0000 1.10
@@ -67,20 +67,8 @@
static inline id KWQCFAutorelease(CFTypeRef obj)
{
-#if !BUILDING_ON_PANTHER
- if (obj) CFMakeCollectable(obj);
-#endif
+ if (obj)
+ CFMakeCollectable(obj);
[(id)obj autorelease];
return (id)obj;
}
-
-// Definitions for GC-specific methods for Panther.
-// The finalize method simply won't be called.
-
-#if BUILDING_ON_PANTHER
-
- at interface NSObject (KWQFoundationExtras)
-- (void)finalize;
- at end
-
-#endif
1.49 +2 -14 WebCore/kwq/KWQPixmap.mm
Index: KWQPixmap.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQPixmap.mm,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- KWQPixmap.mm 25 Feb 2005 00:25:12 -0000 1.48
+++ KWQPixmap.mm 16 Aug 2005 19:03:19 -0000 1.49
@@ -92,14 +92,8 @@
QPixmap::QPixmap(const QPixmap ©From) : QPaintDevice(copyFrom)
{
-#if BUILDING_ON_PANTHER
- imageRenderer = KWQRetain(copyFrom.imageRenderer);
- copyFrom.needCopyOnWrite = true;
- needCopyOnWrite = true;
-#else
imageRenderer = KWQRetainNSRelease([copyFrom.imageRenderer copyWithZone:NULL]);;
needCopyOnWrite = false;
-#endif
MIMEType = KWQRetainNSRelease([copyFrom.MIMEType copy]);
}
@@ -121,8 +115,6 @@
}
}
-
-#if !defined(BUILDING_ON_PANTHER)
@interface WebImageCallback : NSObject
{
khtml::CachedImageCallback *callback;
@@ -132,6 +124,7 @@
- (void)setImageSourceStatus:(CGImageSourceStatus)status;
- (CGImageSourceStatus)status;
@end
+
@implementation WebImageCallback
- initWithCallback:(khtml::CachedImageCallback *)c
{
@@ -181,7 +174,6 @@
}
@end
-#endif
bool QPixmap::shouldUseThreadedDecoding()
{
@@ -194,17 +186,13 @@
imageRenderer = KWQRetain([[WebCoreImageRendererFactory sharedFactory] imageRendererWithMIMEType:MIMEType]);
}
-#if !defined(BUILDING_ON_PANTHER)
- WebImageCallback *callbackWrapper = 0;
+ WebImageCallback *callbackWrapper = nil;
if (decoderCallback)
callbackWrapper = [[WebImageCallback alloc] initWithCallback:decoderCallback];
bool result = [imageRenderer incrementalLoadWithBytes:bytes.data() length:bytes.size() complete:isComplete callback:callbackWrapper];
[callbackWrapper release];
-#else
- bool result = [imageRenderer incrementalLoadWithBytes:bytes.data() length:bytes.size() complete:isComplete callback:0];
-#endif
return result;
}
1.114 +0 -6 WebCore/kwq/KWQString.h
Index: KWQString.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQString.h,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- KWQString.h 28 Jun 2005 01:54:35 -0000 1.113
+++ KWQString.h 16 Aug 2005 19:03:19 -0000 1.114
@@ -215,12 +215,6 @@
inline QChar::Direction QChar::direction() const
{
-#if BUILDING_ON_PANTHER
- // Panther gets the direction of the hyphen wrong.
- // It returns "ET" (European Terminator) when it should return "ES" (European Separator).
- if (c == '-')
- return DirES;
-#endif
return static_cast<Direction>(u_charDirection(c));
}
1.88 +0 -5 WebCore/kwq/KWQTextArea.mm
Index: KWQTextArea.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQTextArea.mm,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- KWQTextArea.mm 26 Jul 2005 16:34:13 -0000 1.87
+++ KWQTextArea.mm 16 Aug 2005 19:03:19 -0000 1.88
@@ -421,12 +421,7 @@
- (void)tile
{
[super tile];
-#if !BUILDING_ON_PANTHER
[self _updateTextViewWidth];
-#else
- // Pre-Tiger, if we change the width here we re-enter in a way that makes NSText unhappy.
- [self performSelector:@selector(_updateTextViewWidth) withObject:nil afterDelay:0];
-#endif
// If we're still initializing, it's too early to call _isResizableByUser. -tile will be called
// again before we're displayed, so just skip the resizable stuff.
1.49 +0 -8 WebCore/kwq/KWQTextEdit.mm
Index: KWQTextEdit.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQTextEdit.mm,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- KWQTextEdit.mm 14 Jul 2005 02:22:12 -0000 1.48
+++ KWQTextEdit.mm 16 Aug 2005 19:03:19 -0000 1.49
@@ -125,23 +125,15 @@
KWQ_BLOCK_EXCEPTIONS;
-#if !BUILDING_ON_PANTHER
// this declaration must be inside the KWQ_BLOCK_EXCEPTIONS block or the deployment build fails
bool autohides = hMode == Auto || vMode == Auto;
ASSERT(!autohides || hMode != AlwaysOn);
ASSERT(!autohides || vMode != AlwaysOn);
-#endif
[textView setHasHorizontalScroller:hMode != AlwaysOff];
[textView setHasVerticalScroller:vMode != AlwaysOff];
-
-#if !BUILDING_ON_PANTHER
- // Bugs 3890352 and 4005435 are the reason we can't handle auto-hiding on Panther.
- // Basically, the text machinery seems to be able to handle the case where new text
- // causes the text view to become more narrow on Tiger, but not on Panther.
[textView setAutohidesScrollers:autohides];
-#endif
KWQ_UNBLOCK_EXCEPTIONS;
}
1.85 +0 -9 WebCore/kwq/KWQTextField.mm
Index: KWQTextField.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQTextField.mm,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- KWQTextField.mm 26 Jul 2005 17:37:21 -0000 1.84
+++ KWQTextField.mm 16 Aug 2005 19:03:19 -0000 1.85
@@ -431,15 +431,6 @@
- (NSString *)string
{
-#if BUILDING_ON_PANTHER
- // On Panther, the secure text field's editor does not contain the real
- // string, so we must always call stringValue on the field. We'll live
- // with the side effect of ending International inline input for these
- // password fields on Panther only, since it's fixed in Tiger.
- if ([field isKindOfClass:[NSSecureTextField class]]) {
- return [field stringValue];
- }
-#endif
// Calling stringValue can have a side effect of ending International inline input.
// So don't call it unless there's no editor.
NSText *editor = [field _KWQ_currentEditor];
1.8 +0 -5 WebCore/kwq/KWQTextUtilities.mm
Index: KWQTextUtilities.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQTextUtilities.mm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- KWQTextUtilities.mm 10 Jan 2005 18:22:06 -0000 1.7
+++ KWQTextUtilities.mm 16 Aug 2005 19:03:20 -0000 1.8
@@ -85,17 +85,12 @@
}
if (prefLocaleStr) {
-#ifdef BUILDING_ON_PANTHER
- CFStringGetCString( prefLocaleStr, localeString, localeStringLength, kCFStringEncodingASCII );
-#else
// Canonicalize pref string in case it is not in the canonical format. This call is only available on Tiger and newer.
CFStringRef canonLocaleCFStr = CFLocaleCreateCanonicalLanguageIdentifierFromString(kCFAllocatorDefault, prefLocaleStr);
if (canonLocaleCFStr) {
CFStringGetCString(canonLocaleCFStr, localeString, localeStringLength, kCFStringEncodingASCII);
CFRelease(canonLocaleCFStr);
}
-#endif
-
CFRelease(prefLocaleStr);
}
1.3 +0 -32 WebCore/kwq/WebCoreScrollView.m
Index: WebCoreScrollView.m
===================================================================
RCS file: /cvs/root/WebCore/kwq/WebCoreScrollView.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WebCoreScrollView.m 10 Feb 2005 21:29:32 -0000 1.2
+++ WebCoreScrollView.m 16 Aug 2005 19:03:20 -0000 1.3
@@ -27,41 +27,9 @@
@implementation WebCoreScrollView
-#if !BUILDING_ON_PANTHER
-
- (BOOL)autoforwardsScrollWheelEvents
{
return YES;
}
-#else
-
-- (void)scrollWheel:(NSEvent *)event
-{
- NSPoint origin = [[self contentView] bounds].origin;
-
- // Compute a new origin as if we had scrolled a little bit.
- // If we constrain this and nothing happens, that means we're already scrolled to the limit.
- NSPoint newOrigin = origin;
- if ([event deltaX] > 0) {
- newOrigin.x -= 1;
- } else if ([event deltaX] < 0) {
- newOrigin.x += 1;
- }
- if ([event deltaY] > 0) {
- newOrigin.y -= 1;
- } else if ([event deltaY] < 0) {
- newOrigin.y += 1;
- }
-
- // If we are already scrolled to the limit, pass on this event, and send it on to the next responder
- if (NSEqualPoints(origin, [[self contentView] constrainScrollPoint:newOrigin])) {
- [[self nextResponder] tryToPerform:@selector(scrollWheel:) with:event];
- } else {
- [super scrollWheel:event];
- }
-}
-
-#endif
-
@end
1.3292 +64 -0 WebKit/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebKit/ChangeLog,v
retrieving revision 1.3291
retrieving revision 1.3292
diff -u -r1.3291 -r1.3292
--- ChangeLog 16 Aug 2005 17:36:33 -0000 1.3291
+++ ChangeLog 16 Aug 2005 19:03:22 -0000 1.3292
@@ -2,6 +2,70 @@
Reviewed by Beth Dakin.
+ - removed Panther-only code that was not being compiled and was
+ simply "bit-rotting"
+
+ * Misc.subproj/WebFileDatabase.m:
+ (-[WebFileDatabase _createLRUList:]):
+ (+[WebFileDatabase _syncLoop:]):
+ * Misc.subproj/WebKitErrors.m:
+ (registerErrors):
+ * Misc.subproj/WebNSObjectExtras.h:
+ (WebCFAutorelease):
+ * Misc.subproj/WebNSPasteboardExtras.m:
+ (-[NSPasteboard _web_declareAndWriteDragImage:URL:title:archive:source:]):
+ * WebCoreSupport.subproj/WebImageData.h:
+ * WebCoreSupport.subproj/WebImageDecodeItem.h:
+ * WebCoreSupport.subproj/WebImageDecodeItem.m:
+ * WebCoreSupport.subproj/WebImageDecoder.h:
+ * WebCoreSupport.subproj/WebImageDecoder.m:
+ (decoderThread):
+ (startDecoderThread):
+ * WebCoreSupport.subproj/WebKeyGeneration.cpp: Removed.
+ * WebCoreSupport.subproj/WebKeyGeneration.h: Removed.
+ * WebCoreSupport.subproj/WebKeyGenerator.h:
+ * WebCoreSupport.subproj/WebTextRenderer.m:
+ (getUncachedWidth):
+ (_drawGlyphs):
+ * WebCoreSupport.subproj/WebViewFactory.m:
+ (-[WebViewFactory getBytes:fromTextMarker:length:]):
+ * WebKit.xcodeproj/project.pbxproj:
+ * WebKitPrefix.h:
+ * WebView.subproj/WebDataSource.m:
+ (-[WebDataSource _setPrimaryLoadComplete:]):
+ (+[WebDataSource _repTypesAllowImageTypeOmission:]):
+ (-[WebDataSource isLoading]):
+ * WebView.subproj/WebDefaultContextMenuDelegate.m:
+ (localizedMenuTitleFromAppKit):
+ (-[WebDefaultUIDelegate menuItemWithTag:]):
+ (-[WebDefaultUIDelegate contextMenuItemsForElement:defaultMenuItems:]):
+ (-[WebDefaultUIDelegate editingContextMenuItemsForElement:defaultMenuItems:]):
+ * WebView.subproj/WebFormDataStream.m:
+ (formCanRead):
+ (webSetHTTPBody):
+ * WebView.subproj/WebFrameView.m:
+ (+[WebFrameView _viewTypesAllowImageTypeOmission:]):
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView _documentFragmentFromPasteboard:allowPlainText:chosePlainText:]):
+ (-[WebHTMLView resourceForData:preferredFilename:]):
+ (-[WebHTMLView _lookUpInDictionaryFromMenu:]):
+ (-[WebHTMLView validateUserInterfaceItem:]):
+ (-[WebHTMLView _attributeStringFromDOMRange:]):
+ (-[WebHTMLView toggleBaseWritingDirection:]):
+ (-[WebHTMLView changeBaseWritingDirection:]):
+ * WebView.subproj/WebPDFRepresentation.h:
+ * WebView.subproj/WebPDFRepresentation.m:
+ * WebView.subproj/WebPDFView.h:
+ * WebView.subproj/WebPDFView.m:
+ * WebView.subproj/WebPreferences.m:
+ (+[WebPreferences _systemCFStringEncoding]):
+ * WebView.subproj/WebView.m:
+ (-[WebView _commonInitializationWithFrameName:groupName:]):
+
+2005-08-16 Darin Adler <darin at apple.com>
+
+ Reviewed by Beth Dakin.
+
- removed some unnecessary code
* WebCoreSupport.subproj/WebGraphicsBridge.h: Removed pattern-phase related field and methods.
1.12 +0 -8 WebKit/WebKitPrefix.h
Index: WebKitPrefix.h
===================================================================
RCS file: /cvs/root/WebKit/WebKitPrefix.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- WebKitPrefix.h 5 Jun 2005 17:54:19 -0000 1.11
+++ WebKitPrefix.h 16 Aug 2005 19:03:25 -0000 1.12
@@ -61,11 +61,3 @@
#endif
#endif
-
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3
-#define BUILDING_ON_PANTHER 1
-#endif
-
-#if BUILDING_ON_PANTHER
-#define OMIT_TIGER_FEATURES 1
-#endif
1.76 +0 -8 WebKit/Misc.subproj/WebFileDatabase.m
Index: WebFileDatabase.m
===================================================================
RCS file: /cvs/root/WebKit/Misc.subproj/WebFileDatabase.m,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- WebFileDatabase.m 5 Jun 2005 17:54:25 -0000 1.75
+++ WebFileDatabase.m 16 Aug 2005 19:03:29 -0000 1.76
@@ -230,11 +230,7 @@
LOG(FileDatabaseActivity, "lru list created");
-#if BUILDING_ON_PANTHER
- [pool release];
-#else
[pool drain];
-#endif
}
-(void)_truncateToSizeLimit:(unsigned)size
@@ -298,11 +294,7 @@
END_EXCEPTION_HANDLER
-#if BUILDING_ON_PANTHER
- [pool release];
-#else
[pool drain];
-#endif
}
static void databaseInit()
1.25 +0 -4 WebKit/Misc.subproj/WebKitErrors.m
Index: WebKitErrors.m
===================================================================
RCS file: /cvs/root/WebKit/Misc.subproj/WebKitErrors.m,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- WebKitErrors.m 5 Jun 2005 17:54:25 -0000 1.24
+++ WebKitErrors.m 16 Aug 2005 19:03:29 -0000 1.25
@@ -155,11 +155,7 @@
[NSError _webkit_addErrorsWithCodesAndDescriptions:dict inDomain:WebKitErrorDomain];
-#if BUILDING_ON_PANTHER
- [pool release];
-#else
[pool drain];
-#endif
}
@end
1.6 +2 -11 WebKit/Misc.subproj/WebNSObjectExtras.h
Index: WebNSObjectExtras.h
===================================================================
RCS file: /cvs/root/WebKit/Misc.subproj/WebNSObjectExtras.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WebNSObjectExtras.h 5 Jun 2005 17:54:26 -0000 1.5
+++ WebNSObjectExtras.h 16 Aug 2005 19:03:29 -0000 1.6
@@ -35,17 +35,8 @@
static inline id WebCFAutorelease(CFTypeRef obj)
{
-#if !BUILDING_ON_PANTHER
- if (obj) CFMakeCollectable(obj);
-#endif
+ if (obj)
+ CFMakeCollectable(obj);
[(id)obj autorelease];
return (id)obj;
}
-
-#if BUILDING_ON_PANTHER
-
- at interface NSObject (WebExtras)
-- (void)finalize;
- at end
-
-#endif
1.48 +0 -6 WebKit/Misc.subproj/WebNSPasteboardExtras.m
Index: WebNSPasteboardExtras.m
===================================================================
RCS file: /cvs/root/WebKit/Misc.subproj/WebNSPasteboardExtras.m,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- WebNSPasteboardExtras.m 14 Jul 2005 02:43:51 -0000 1.47
+++ WebNSPasteboardExtras.m 16 Aug 2005 19:03:29 -0000 1.48
@@ -274,14 +274,8 @@
}
NSArray *extensions = [NSArray arrayWithObject:extension];
-#ifdef OMIT_TIGER_FEATURES
- id dragSource = [[NSFilePromiseDragSource alloc] initWithSource:source];
- [dragSource setTypes:extensions onPasteboard:self];
- return dragSource;
-#else
[self setPropertyList:extensions forType:NSFilesPromisePboardType];
return source;
-#endif
}
@end
1.18 +0 -4 WebKit/WebCoreSupport.subproj/WebImageData.h
Index: WebImageData.h
===================================================================
RCS file: /cvs/root/WebKit/WebCoreSupport.subproj/WebImageData.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- WebImageData.h 5 Jun 2005 17:54:40 -0000 1.17
+++ WebImageData.h 16 Aug 2005 19:03:30 -0000 1.18
@@ -26,8 +26,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef OMIT_TIGER_FEATURES
-
#import <Cocoa/Cocoa.h>
@class WebImageRenderer;
@@ -90,5 +88,3 @@
- (void)resetAnimation;
@end
-
-#endif
1.4 +0 -4 WebKit/WebCoreSupport.subproj/WebImageDecodeItem.h
Index: WebImageDecodeItem.h
===================================================================
RCS file: /cvs/root/WebKit/WebCoreSupport.subproj/WebImageDecodeItem.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WebImageDecodeItem.h 5 Jun 2005 17:54:40 -0000 1.3
+++ WebImageDecodeItem.h 16 Aug 2005 19:03:30 -0000 1.4
@@ -26,8 +26,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef OMIT_TIGER_FEATURES
-
#import <Cocoa/Cocoa.h>
@class WebImageData;
@@ -43,5 +41,3 @@
+ decodeItemWithImage:(WebImageData *)img data:(CFDataRef)d isComplete:(BOOL)f callback:(id)c;
- initWithImage:(WebImageData *)img data:(CFDataRef)d isComplete:(BOOL)f callback:(id)c;
@end
-
-#endif
1.4 +2 -5 WebKit/WebCoreSupport.subproj/WebImageDecodeItem.m
Index: WebImageDecodeItem.m
===================================================================
RCS file: /cvs/root/WebKit/WebCoreSupport.subproj/WebImageDecodeItem.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WebImageDecodeItem.m 5 Jun 2005 17:54:40 -0000 1.3
+++ WebImageDecodeItem.m 16 Aug 2005 19:03:30 -0000 1.4
@@ -26,10 +26,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit/WebImageDecodeItem.h>
-#import <WebKit/WebImageData.h>
+#import "WebImageDecodeItem.h"
-#ifndef OMIT_TIGER_FEATURES
+#import "WebImageData.h"
@implementation WebImageDecodeItem
@@ -63,5 +62,3 @@
}
@end
-
-#endif
1.4 +1 -4 WebKit/WebCoreSupport.subproj/WebImageDecoder.h
Index: WebImageDecoder.h
===================================================================
RCS file: /cvs/root/WebKit/WebCoreSupport.subproj/WebImageDecoder.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WebImageDecoder.h 5 Jun 2005 17:54:40 -0000 1.3
+++ WebImageDecoder.h 16 Aug 2005 19:03:30 -0000 1.4
@@ -26,9 +26,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef OMIT_TIGER_FEATURES
-
#import <WebKit/WebImageDecodeItem.h>
+
@class WebImageData;
@interface WebImageDecoder : NSObject
@@ -47,5 +46,3 @@
- (void)addItem:(WebImageDecodeItem *)item;
- (void)decodeItem:(WebImageDecodeItem *)item;
@end
-
-#endif
1.4 +6 -8 WebKit/WebCoreSupport.subproj/WebImageDecoder.m
Index: WebImageDecoder.m
===================================================================
RCS file: /cvs/root/WebKit/WebCoreSupport.subproj/WebImageDecoder.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WebImageDecoder.m 5 Jun 2005 17:54:40 -0000 1.3
+++ WebImageDecoder.m 16 Aug 2005 19:03:30 -0000 1.4
@@ -26,11 +26,10 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit/WebAssertions.h>
-#import <WebKit/WebImageDecoder.h>
-#import <WebKit/WebImageData.h>
+#import "WebImageDecoder.h"
-#ifndef OMIT_TIGER_FEATURES
+#import "WebAssertions.h"
+#import "WebImageData.h"
@interface WebImageCallback : NSObject
- (void)notify;
@@ -292,12 +291,13 @@
}
[pool release];
- };
+ }
return 0;
}
-static void startDecoderThread() {
+static void startDecoderThread(void)
+{
pthread_attr_t attr;
pthread_t tid;
pthread_attr_init(&attr);
@@ -306,5 +306,3 @@
pthread_create(&tid, &attr, decoderThread, 0);
pthread_attr_destroy(&attr);
}
-
-#endif
1.8 +0 -4 WebKit/WebCoreSupport.subproj/WebKeyGenerator.h
Index: WebKeyGenerator.h
===================================================================
RCS file: /cvs/root/WebKit/WebCoreSupport.subproj/WebKeyGenerator.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- WebKeyGenerator.h 5 Jun 2005 17:54:40 -0000 1.7
+++ WebKeyGenerator.h 16 Aug 2005 19:03:30 -0000 1.8
@@ -26,10 +26,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef BUILDING_ON_PANTHER
-#define USE_NEW_KEY_GENERATION
-#endif
-
typedef enum {
WebCertificateParseResultSucceeded = 0,
WebCertificateParseResultFailed = 1,
1.187 +9 -52 WebKit/WebCoreSupport.subproj/WebTextRenderer.m
Index: WebTextRenderer.m
===================================================================
RCS file: /cvs/root/WebKit/WebCoreSupport.subproj/WebTextRenderer.m,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- WebTextRenderer.m 15 Aug 2005 21:29:00 -0000 1.186
+++ WebTextRenderer.m 16 Aug 2005 19:03:30 -0000 1.187
@@ -205,46 +205,22 @@
static inline WebGlyphWidth widthFromMap (WebTextRenderer *renderer, WidthMap *map, ATSGlyphRef glyph, NSFont *font);
static inline WebGlyphWidth widthForGlyph (WebTextRenderer *renderer, ATSGlyphRef glyph, NSFont *font);
-#if BUILDING_ON_PANTHER
-
static WebGlyphWidth getUncachedWidth(WebTextRenderer *renderer, WidthMap *map, ATSGlyphRef glyph, NSFont *font)
{
- WebGlyphWidth width;
-
if (font == NULL)
font = renderer->font;
- if (!CGFontGetGlyphScaledAdvances ([font _backingCGSFont], &glyph, 1, &width, [font pointSize])) {
- ERROR ("Unable to cache glyph widths for %@ %f", [font displayName], [font pointSize]);
- return 0.0F;
- }
-
- return width;
-}
-
-#else
-
-static WebGlyphWidth getUncachedWidth(WebTextRenderer *renderer, WidthMap *map, ATSGlyphRef glyph, NSFont *font)
-{
- float pointSize;
- CGAffineTransform m;
+ float pointSize = [font pointSize];
+ CGAffineTransform m = CGAffineTransformMakeScale(pointSize, pointSize);
CGSize advance;
-
- if (font == NULL)
- font = renderer->font;
-
- pointSize = [font pointSize];
- m = CGAffineTransformMakeScale(pointSize, pointSize);
if (!WKGetGlyphTransformedAdvances(font, &m, &glyph, &advance)) {
- ERROR ("Unable to cache glyph widths for %@ %f", [font displayName], pointSize);
- return 0;
+ ERROR("Unable to cache glyph widths for %@ %f", [font displayName], pointSize);
+ return 0;
}
return advance.width;
}
-#endif
-
static inline WebGlyphWidth widthFromMap (WebTextRenderer *renderer, WidthMap *map, ATSGlyphRef glyph, NSFont *font)
{
WebGlyphWidth width = UNINITIALIZED_GLYPH_WIDTH;
@@ -923,24 +899,6 @@
originalShouldUseFontSmoothing = WKCGContextGetShouldSmoothFonts (cgContext);
CGContextSetShouldSmoothFonts (cgContext, [WebView _shouldUseFontSmoothing]);
-#if BUILDING_ON_PANTHER
- if ([gContext isDrawingToScreen]){
- NSFont *screenFont = [font screenFont];
- if (screenFont != font){
- // We are getting this in too many places (3406411); use ERROR so it only prints on
- // debug versions for now. (We should debug this also, eventually).
- ERROR ("Attempting to set non-screen font (%@) when drawing to screen. Using screen font anyway, may result in incorrect metrics.", [[[font fontDescriptor] fontAttributes] objectForKey: NSFontNameAttribute]);
- }
- [screenFont set];
- }
- else {
- NSFont *printerFont = [font printerFont];
- if (printerFont != font){
- NSLog (@"Attempting to set non-printer font (%@) when printing. Using printer font anyway, may result in incorrect metrics.", [[[font fontDescriptor] fontAttributes] objectForKey: NSFontNameAttribute]);
- }
- [printerFont set];
- }
-#else
NSFont *drawFont;
if ([gContext isDrawingToScreen]){
@@ -960,22 +918,21 @@
NSView *v = [NSView focusView];
- CGContextSetFont (cgContext, WKGetCGFontFromNSFont(drawFont));
+ CGContextSetFont(cgContext, WKGetCGFontFromNSFont(drawFont));
- // Deal will flipping flippyness.
+ // Deal with flipping flippyness.
const float *matrix = [drawFont matrix];
float flip = [v isFlipped] ? -1 : 1;
CGContextSetTextMatrix(cgContext, CGAffineTransformMake(matrix[0], matrix[1] * flip, matrix[2], matrix[3] * flip, matrix[4], matrix[5]));
WKSetCGFontRenderingMode(cgContext, drawFont);
CGContextSetFontSize(cgContext, 1.0F);
-#endif
[color set];
- CGContextSetTextPosition (cgContext, x, y);
- CGContextShowGlyphsWithAdvances (cgContext, glyphs, advances, numGlyphs);
+ CGContextSetTextPosition(cgContext, x, y);
+ CGContextShowGlyphsWithAdvances(cgContext, glyphs, advances, numGlyphs);
- CGContextSetShouldSmoothFonts (cgContext, originalShouldUseFontSmoothing);
+ CGContextSetShouldSmoothFonts(cgContext, originalShouldUseFontSmoothing);
}
}
1.37 +1 -44 WebKit/WebCoreSupport.subproj/WebViewFactory.m
Index: WebViewFactory.m
===================================================================
RCS file: /cvs/root/WebKit/WebCoreSupport.subproj/WebViewFactory.m,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- WebViewFactory.m 6 Jun 2005 12:48:06 -0000 1.36
+++ WebViewFactory.m 16 Aug 2005 19:03:31 -0000 1.37
@@ -133,47 +133,6 @@
return [NSUserDefaults _webkit_preferredLanguageCode];
}
-// FIXME: The guts of this next set of methods needs to move inside WebKitSystemInterface.
-
-#if BUILDING_ON_PANTHER
-
-- (BOOL)objectIsTextMarker:(id)object
-{
- return NO;
-}
-
-- (BOOL)objectIsTextMarkerRange:(id)object
-{
- return NO;
-}
-
-- (WebCoreTextMarker *)textMarkerWithBytes:(const void *)bytes length:(size_t)length
-{
- return nil;
-}
-
-- (BOOL)getBytes:(void *)bytes fromTextMarker:(WebCoreTextMarker *)textMarker length:(size_t)length
-{
- return NO;
-}
-
-- (WebCoreTextMarkerRange *)textMarkerRangeWithStart:(WebCoreTextMarker *)start end:(WebCoreTextMarker *)end
-{
- return nil;
-}
-
-- (WebCoreTextMarker *)startOfTextMarkerRange:(WebCoreTextMarkerRange *)range
-{
- return nil;
-}
-
-- (WebCoreTextMarker *)endOfTextMarkerRange:(WebCoreTextMarkerRange *)range
-{
- return nil;
-}
-
-#else
-
- (BOOL)objectIsTextMarker:(id)object
{
return object != nil && CFGetTypeID(object) == WKGetAXTextMarkerTypeID();
@@ -191,7 +150,7 @@
- (BOOL)getBytes:(void *)bytes fromTextMarker:(WebCoreTextMarker *)textMarker length:(size_t)length
{
- return WKGetBytesFromAXTextMarker(textMarker, bytes, length);
+ return WKGetBytesFromAXTextMarker(textMarker, bytes, length);
}
- (WebCoreTextMarkerRange *)textMarkerRangeWithStart:(WebCoreTextMarker *)start end:(WebCoreTextMarker *)end
@@ -217,8 +176,6 @@
return WebCFAutorelease(WKCopyAXTextMarkerRangeEnd(range));
}
-#endif
-
- (void)accessibilityHandleFocusChanged
{
WKAccessibilityHandleFocusChanged();
1.5 +0 -8 WebKit/WebKit.xcodeproj/project.pbxproj
Index: project.pbxproj
===================================================================
RCS file: /cvs/root/WebKit/WebKit.xcodeproj/project.pbxproj,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.pbxproj 6 Aug 2005 02:30:26 -0000 1.4
+++ project.pbxproj 16 Aug 2005 19:03:33 -0000 1.5
@@ -140,7 +140,6 @@
939810830824BF01008DF038 /* WebUIDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 65A7D44A0568AB2600E70EF6 /* WebUIDelegatePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
939810840824BF01008DF038 /* WebNSEventExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = BE887BFF056D3A6E009BB3E7 /* WebNSEventExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
939810850824BF01008DF038 /* WebKeyGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = 84723BE3056D719E0044BFEA /* WebKeyGenerator.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 939810860824BF01008DF038 /* WebKeyGeneration.h in Headers */ = {isa = PBXBuildFile; fileRef = 830E81830585375700AD0891 /* WebKeyGeneration.h */; };
939810870824BF01008DF038 /* WebNSPrintOperationExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = EDD1A5C605C83987008E3150 /* WebNSPrintOperationExtras.h */; };
939810880824BF01008DF038 /* WebResource.h in Headers */ = {isa = PBXBuildFile; fileRef = 84311A1205EAAAF00088EDA4 /* WebResource.h */; settings = {ATTRIBUTES = (Public, ); }; };
939810890824BF01008DF038 /* WebResourcePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 84311AF105EAB12B0088EDA4 /* WebResourcePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -264,7 +263,6 @@
939811150824BF01008DF038 /* WebNSDataExtras.m in Sources */ = {isa = PBXBuildFile; fileRef = BECD142A0565830A005BB09C /* WebNSDataExtras.m */; };
939811160824BF01008DF038 /* WebNSEventExtras.m in Sources */ = {isa = PBXBuildFile; fileRef = BE887C00056D3A6E009BB3E7 /* WebNSEventExtras.m */; };
939811170824BF01008DF038 /* WebKeyGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = 84723BE4056D719E0044BFEA /* WebKeyGenerator.m */; };
- 939811180824BF01008DF038 /* WebKeyGeneration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 830E81840585375700AD0891 /* WebKeyGeneration.cpp */; };
939811190824BF01008DF038 /* WebNSPrintOperationExtras.m in Sources */ = {isa = PBXBuildFile; fileRef = EDD1A5C705C83987008E3150 /* WebNSPrintOperationExtras.m */; };
9398111A0824BF01008DF038 /* WebResource.m in Sources */ = {isa = PBXBuildFile; fileRef = 84311A1305EAAAF00088EDA4 /* WebResource.m */; };
9398111B0824BF01008DF038 /* WebDefaultEditingDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = BE95BEE505FD0805006E1513 /* WebDefaultEditingDelegate.m */; };
@@ -427,8 +425,6 @@
7E6FEF0508985A7200C44C3F /* WebScriptDebugDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebScriptDebugDelegate.h; sourceTree = "<group>"; };
7E6FEF0608985A7200C44C3F /* WebScriptDebugDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebScriptDebugDelegate.m; sourceTree = "<group>"; };
7E6FEF0708985A7200C44C3F /* WebScriptDebugDelegatePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebScriptDebugDelegatePrivate.h; sourceTree = "<group>"; };
- 830E81830585375700AD0891 /* WebKeyGeneration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKeyGeneration.h; sourceTree = "<group>"; };
- 830E81840585375700AD0891 /* WebKeyGeneration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKeyGeneration.cpp; sourceTree = "<group>"; };
830E81E005853AC000AD0891 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };
832D7E030709D8FB00F49B61 /* WebPluginDocumentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPluginDocumentView.h; sourceTree = "<group>"; };
832D7E040709D8FB00F49B61 /* WebPluginDocumentView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebPluginDocumentView.m; sourceTree = "<group>"; };
@@ -1013,8 +1009,6 @@
9CE1F8A302A5C6F30ECA2ACD /* WebImageRendererFactory.m */,
9345D4EA0365C5B2008635CE /* WebJavaScriptTextInputPanel.h */,
9345D4EB0365C5B2008635CE /* WebJavaScriptTextInputPanel.m */,
- 830E81830585375700AD0891 /* WebKeyGeneration.h */,
- 830E81840585375700AD0891 /* WebKeyGeneration.cpp */,
84723BE3056D719E0044BFEA /* WebKeyGenerator.h */,
84723BE4056D719E0044BFEA /* WebKeyGenerator.m */,
F5E0E10802BC45F8018635CA /* WebSubresourceLoader.h */,
@@ -1227,7 +1221,6 @@
939810830824BF01008DF038 /* WebUIDelegatePrivate.h in Headers */,
939810840824BF01008DF038 /* WebNSEventExtras.h in Headers */,
939810850824BF01008DF038 /* WebKeyGenerator.h in Headers */,
- 939810860824BF01008DF038 /* WebKeyGeneration.h in Headers */,
939810870824BF01008DF038 /* WebNSPrintOperationExtras.h in Headers */,
939810880824BF01008DF038 /* WebResource.h in Headers */,
939810890824BF01008DF038 /* WebResourcePrivate.h in Headers */,
@@ -1784,7 +1777,6 @@
939811150824BF01008DF038 /* WebNSDataExtras.m in Sources */,
939811160824BF01008DF038 /* WebNSEventExtras.m in Sources */,
939811170824BF01008DF038 /* WebKeyGenerator.m in Sources */,
- 939811180824BF01008DF038 /* WebKeyGeneration.cpp in Sources */,
939811190824BF01008DF038 /* WebNSPrintOperationExtras.m in Sources */,
9398111A0824BF01008DF038 /* WebResource.m in Sources */,
9398111B0824BF01008DF038 /* WebDefaultEditingDelegate.m in Sources */,
1.208 +1 -9 WebKit/WebView.subproj/WebDataSource.m
Index: WebDataSource.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebDataSource.m,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- WebDataSource.m 24 Jul 2005 22:58:23 -0000 1.207
+++ WebDataSource.m 16 Aug 2005 19:03:34 -0000 1.208
@@ -55,9 +55,7 @@
#import <WebKit/WebMainResourceLoader.h>
#import <WebKit/WebNSObjectExtras.h>
#import <WebKit/WebNSURLExtras.h>
-#ifndef OMIT_TIGER_FEATURES
#import <WebKit/WebPDFRepresentation.h>
-#endif
#import <WebKit/WebResourceLoadDelegate.h>
#import <WebKit/WebResourcePrivate.h>
#import <WebKit/WebTextRepresentation.h>
@@ -333,7 +331,7 @@
_private->primaryLoadComplete = flag;
if (flag) {
- // FIXME: We could actually load it as soon as we've parsed
+ // FIXME: We could actually load it as soon as we've parsed
// the HEAD section, or determined there isn't one - but
// there's no callback for that.
[self _loadIcon];
@@ -671,14 +669,12 @@
[WebTextRepresentation class], @"application/x-javascript",
nil];
-#ifndef OMIT_TIGER_FEATURES
// Since this is a "secret default" we don't both registering it.
BOOL omitPDFSupport = [[NSUserDefaults standardUserDefaults] boolForKey:@"WebKitOmitPDFSupport"];
if (!omitPDFSupport) {
[repTypes setObject:[WebPDFRepresentation class] forKey:@"text/pdf"];
[repTypes setObject:[WebPDFRepresentation class] forKey:@"application/pdf"];
}
-#endif
}
if (!addedImageTypes && !allowImageTypeOmission) {
@@ -1157,11 +1153,7 @@
}
}
-#if BUILDING_ON_PANTHER
- [pool release];
-#else
[pool drain];
-#endif
return childFrame != nil;
}
1.85 +3 -11 WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
Index: WebDefaultContextMenuDelegate.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- WebDefaultContextMenuDelegate.m 2 Aug 2005 17:14:41 -0000 1.84
+++ WebDefaultContextMenuDelegate.m 16 Aug 2005 19:03:34 -0000 1.85
@@ -52,7 +52,6 @@
@implementation WebDefaultUIDelegate (WebContextMenu)
-#ifndef OMIT_TIGER_FEATURES
static NSString *localizedMenuTitleFromAppKit(NSString *key, NSString *comment)
{
NSBundle *appKitBundle = [NSBundle bundleWithIdentifier:@"com.apple.AppKit"];
@@ -65,7 +64,6 @@
}
return result;
}
-#endif
- (NSMenuItem *)menuItemWithTag:(int)tag
{
@@ -153,7 +151,6 @@
title = UI_STRING("Learn Spelling", "Learn Spelling context menu item");
action = @selector(_learnSpellingFromMenu:);
break;
-#ifndef OMIT_TIGER_FEATURES
case WebMenuItemTagSearchInSpotlight:
// FIXME: Perhaps move this string into WebKit directly when we're not in localization freeze
title = localizedMenuTitleFromAppKit(@"Search in Spotlight", @"Search in Spotlight menu title.");
@@ -169,7 +166,6 @@
title = localizedMenuTitleFromAppKit(@"Look Up in Dictionary", @"Look Up in Dictionary menu title.");
action = @selector(_lookUpInDictionaryFromMenu:);
break;
-#endif
default:
return nil;
}
@@ -231,7 +227,6 @@
if (!imageURL && !linkURL) {
if ([[element objectForKey:WebElementIsSelectedKey] boolValue]) {
-#ifndef OMIT_TIGER_FEATURES
// Add Tiger-only items that act on selected text. Google search needn't be Tiger-only technically,
// but it's a new Tiger-only feature to have it in the context menu by default.
@@ -249,7 +244,6 @@
// but Safari has such code).
[menuItems addObject:[self menuItemWithTag:WebMenuItemTagLookUpInDictionary]];
[menuItems addObject:[NSMenuItem separatorItem]];
-#endif
[menuItems addObject:[self menuItemWithTag:WebMenuItemTagCopy]];
} else {
WebView *wv = [webFrame webView];
@@ -287,7 +281,7 @@
WebHTMLView *HTMLView = (WebHTMLView *)[[[element objectForKey:WebElementFrameKey] frameView] documentView];
ASSERT([HTMLView isKindOfClass:[WebHTMLView class]]);
- // Add spelling related context menu items.
+ // Add spelling-related context menu items.
if ([HTMLView _isSelectionMisspelled]) {
NSArray *guesses = [HTMLView _guessesForMisspelledSelection];
unsigned count = [guesses count];
@@ -308,9 +302,8 @@
[menuItems addObject:[NSMenuItem separatorItem]];
}
-#ifndef OMIT_TIGER_FEATURES
- // Add Tiger-only items that aren't in our nib.
- // FIXME: When we're not building for Panther anymore we should update the nib to include these.
+ // Add items that aren't in our nib, originally because they were Tiger-only.
+ // FIXME: We should update the nib to include these.
[menuItems addObject:[self menuItemWithTag:WebMenuItemTagSearchInSpotlight]];
[menuItems addObject:[self menuItemWithTag:WebMenuItemTagSearchWeb]];
[menuItems addObject:[NSMenuItem separatorItem]];
@@ -320,7 +313,6 @@
// It might be tricky to pull this off in WebKit.
[menuItems addObject:[self menuItemWithTag:WebMenuItemTagLookUpInDictionary]];
[menuItems addObject:[NSMenuItem separatorItem]];
-#endif
// Load our NSTextView-like context menu nib.
if (defaultMenu == nil) {
1.7 +3 -38 WebKit/WebView.subproj/WebFormDataStream.m
Index: WebFormDataStream.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebFormDataStream.m,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- WebFormDataStream.m 6 Jun 2005 13:26:17 -0000 1.6
+++ WebFormDataStream.m 16 Aug 2005 19:03:34 -0000 1.7
@@ -37,8 +37,6 @@
#import "WebNSObjectExtras.h"
#import <WebKitSystemInterface.h>
-#if !BUILDING_ON_PANTHER
-
static void formEventCallback(CFReadStreamRef stream, CFStreamEventType type, void *context);
typedef struct {
@@ -226,7 +224,7 @@
openNextStream(form);
}
if (!form->currentStream) {
- WKSignalCFReadStreamEnd(stream);
+ WKSignalCFReadStreamEnd(stream);
return FALSE;
}
return CFReadStreamHasBytesAvailable(form->currentStream);
@@ -292,8 +290,6 @@
}
}
-#endif // !BUILDING_ON_PANTHER
-
void webSetHTTPBody(NSMutableURLRequest *request, NSArray *formData)
{
unsigned count = [formData count];
@@ -307,8 +303,6 @@
}
}
-#if !BUILDING_ON_PANTHER
-
// Precompute the content length so NSURLConnection doesn't use chunked mode.
long long length = 0;
unsigned i;
@@ -334,36 +328,7 @@
[request setValue:[NSString stringWithFormat:@"%lld", length] forHTTPHeaderField:@"Content-Length"];
// Create and set the stream.
- CFReadStreamRef stream = WKCreateCustomCFReadStream(formCreate, formFinalize, formOpen, formRead, formCanRead, formClose, formSchedule, formUnschedule, formData);
- [request setHTTPBodyStream:(NSInputStream *)stream];
+ CFReadStreamRef stream = WKCreateCustomCFReadStream(formCreate, formFinalize, formOpen, formRead, formCanRead, formClose, formSchedule, formUnschedule, formData);
+ [request setHTTPBodyStream:(NSInputStream *)stream];
CFRelease(stream);
-
-#else
-
- NSMutableData *allData = [[NSMutableData alloc] init];
-
- unsigned i;
- for (i = 0; i < count; ++i) {
- id data = [formData objectAtIndex:i];
- if ([data isKindOfClass:[NSData class]]) {
- NSData *d = data;
- [allData appendData:d];
- } else if ([data isKindOfClass:[NSString class]]) {
- NSString *s = data;
- NSData *d = [[NSData alloc] initWithContentsOfFile:s];
- if (d != nil) {
- [allData appendData:d];
- [d release];
- }
- } else {
- ERROR("item in form data array is neither NSData nor NSString");
- return;
- }
- }
-
- [request setHTTPBody:allData];
-
- [allData release];
-
-#endif
}
1.186 +0 -4 WebKit/WebView.subproj/WebFrameView.m
Index: WebFrameView.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebFrameView.m,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- WebFrameView.m 29 Jul 2005 21:01:37 -0000 1.185
+++ WebFrameView.m 16 Aug 2005 19:03:34 -0000 1.186
@@ -47,9 +47,7 @@
#import <WebKit/WebNSObjectExtras.h>
#import <WebKit/WebNSPasteboardExtras.h>
#import <WebKit/WebNSViewExtras.h>
-#ifndef OMIT_TIGER_FEATURES
#import <WebKit/WebPDFView.h>
-#endif
#import <WebKit/WebTextRendererFactory.h>
#import <WebKit/WebTextView.h>
#import <WebKit/WebViewFactory.h>
@@ -260,14 +258,12 @@
[WebTextView class], @"application/x-javascript",
nil];
-#ifndef OMIT_TIGER_FEATURES
// Since this is a "secret default" we don't both registering it.
BOOL omitPDFSupport = [[NSUserDefaults standardUserDefaults] boolForKey:@"WebKitOmitPDFSupport"];
if (!omitPDFSupport) {
[viewTypes setObject:[WebPDFView class] forKey:@"text/pdf"];
[viewTypes setObject:[WebPDFView class] forKey:@"application/pdf"];
}
-#endif
}
if (!addedImageTypes && !allowImageTypeOmission) {
1.464 +1 -50 WebKit/WebView.subproj/WebHTMLView.m
Index: WebHTMLView.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebHTMLView.m,v
retrieving revision 1.463
retrieving revision 1.464
diff -u -r1.463 -r1.464
--- WebHTMLView.m 8 Aug 2005 16:44:31 -0000 1.463
+++ WebHTMLView.m 16 Aug 2005 19:03:34 -0000 1.464
@@ -140,10 +140,6 @@
#define DRAG_LINK_LABEL_FONT_SIZE 11.0
#define DRAG_LINK_URL_FONT_SIZE 10.0
-#ifndef OMIT_TIGER_FEATURES
-#define USE_APPKIT_FOR_ATTRIBUTED_STRINGS
-#endif
-
// Any non-zero value will do, but using something recognizable might help us debug some day.
#define TRACKING_RECT_TAG 0xBADFACE
@@ -358,7 +354,6 @@
}
}
-#ifdef USE_APPKIT_FOR_ATTRIBUTED_STRINGS
NSAttributedString *string = nil;
if ([types containsObject:NSRTFDPboardType]) {
string = [[NSAttributedString alloc] initWithRTFD:[pasteboard dataForType:NSRTFDPboardType] documentAttributes:NULL];
@@ -379,7 +374,6 @@
[string release];
return fragment;
}
-#endif
if ([types containsObject:NSTIFFPboardType]) {
WebResource *resource = [[WebResource alloc] initWithData:[pasteboard dataForType:NSTIFFPboardType]
@@ -418,7 +412,6 @@
return nil;
}
-#ifdef USE_APPKIT_FOR_ATTRIBUTED_STRINGS
- (WebResource *)resourceForData:(NSData *)data preferredFilename:(NSString *)name
{
// This method is called by [NSAttributedString _documentFromRange::::]
@@ -441,7 +434,6 @@
[[self _dataSource] addSubresource:resource];
return resource;
}
-#endif
- (void)_pasteWithPasteboard:(NSPasteboard *)pasteboard allowPlainText:(BOOL)allowPlainText
{
@@ -1540,8 +1532,6 @@
[[NSSpellChecker sharedSpellChecker] learnWord:[self selectedString]];
}
-#ifndef OMIT_TIGER_FEATURES
-
- (void)_lookUpInDictionaryFromMenu:(id)sender
{
// This should only be called when there's a selection, but play it safe.
@@ -1574,27 +1564,6 @@
NSData *data = [attrString RTFFromRange:NSMakeRange(0, [attrString length]) documentAttributes:nil];
(void)__dictionaryServiceWindowShow(data, rect, (writingDirection == NSWritingDirectionRightToLeft) ? 1 : 0);
}
-#endif
-
-#if APPKIT_CODE_FOR_REFERENCE
-
-- (void)_openLinkFromMenu:(id)sender
-{
- NSTextStorage *text = _getTextStorage(self);
- NSRange charRange = [self selectedRange];
- if (charRange.location != NSNotFound && charRange.length > 0) {
- id link = [text attribute:NSLinkAttributeName atIndex:charRange.location effectiveRange:NULL];
- if (link) {
- [self clickedOnLink:link atIndex:charRange.location];
- } else {
- NSString *string = [[text string] substringWithRange:charRange];
- link = [NSURL URLWithString:string];
- if (link) [[NSWorkspace sharedWorkspace] openURL:link];
- }
- }
-}
-
-#endif
- (BOOL)_transparentBackground
{
@@ -1960,10 +1929,8 @@
[menuItem setState:[[self _bridge] selectionHasStyle:style]];
}
return [self _canEdit];
-#ifndef OMIT_TIGER_FEATURES
} else if (action == @selector(_lookUpInDictionaryFromMenu:)) {
return [self _hasSelection];
-#endif
}
return YES;
@@ -2303,8 +2270,7 @@
- (NSAttributedString *)_attributeStringFromDOMRange:(DOMRange *)range
{
- NSAttributedString *attributedString = nil;
-#ifdef USE_APPKIT_FOR_ATTRIBUTED_STRINGS
+ NSAttributedString *attributedString;
#if !LOG_DISABLED
double start = CFAbsoluteTimeGetCurrent();
#endif
@@ -2313,7 +2279,6 @@
double duration = CFAbsoluteTimeGetCurrent() - start;
LOG(Timing, "creating attributed string from selection took %f seconds.", duration);
#endif
-#endif
return attributedString;
}
@@ -4624,11 +4589,9 @@
break;
// The writingDirectionForSelectionStart method will never return "natural". It
// will always return a concrete direction. So, keep the compiler happy, and assert not reached.
-#if !BUILDING_ON_PANTHER
case NSWritingDirectionNatural:
ASSERT_NOT_REACHED();
break;
-#endif
}
DOMCSSStyleDeclaration *style = [self _emptyStyle];
@@ -4646,9 +4609,7 @@
NSString *direction = @"LTR";
switch (writingDirection) {
case NSWritingDirectionLeftToRight:
-#if !BUILDING_ON_PANTHER
case NSWritingDirectionNatural:
-#endif
break;
case NSWritingDirectionRightToLeft:
direction = @"RTL";
@@ -4756,16 +4717,6 @@
return [super nextResponder];
}
-#if BUILDING_ON_PANTHER
-
-// Work around a bug in Panther where this is called without first calling respondsToSelector.
-- (float)_destinationFloatValueForScroller:(NSScroller *)scroller
-{
- return [scroller floatValue];
-}
-
-#endif
-
@end
@implementation WebHTMLView (WebTextSizing)
1.4 +0 -6 WebKit/WebView.subproj/WebPDFRepresentation.h
Index: WebPDFRepresentation.h
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebPDFRepresentation.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WebPDFRepresentation.h 5 Jun 2005 17:54:48 -0000 1.3
+++ WebPDFRepresentation.h 16 Aug 2005 19:03:35 -0000 1.4
@@ -26,15 +26,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef OMIT_TIGER_FEATURES
-
#import <Foundation/Foundation.h>
@protocol WebDocumentRepresentation;
@interface WebPDFRepresentation : NSObject <WebDocumentRepresentation>
-{
-}
@end
-
-#endif // OMIT_TIGER_FEATURES
1.6 +0 -4 WebKit/WebView.subproj/WebPDFRepresentation.m
Index: WebPDFRepresentation.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebPDFRepresentation.m,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WebPDFRepresentation.m 27 Jul 2005 21:36:44 -0000 1.5
+++ WebPDFRepresentation.m 16 Aug 2005 19:03:35 -0000 1.6
@@ -26,8 +26,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef OMIT_TIGER_FEATURES
-
#import <WebKit/WebAssertions.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebFrame.h>
@@ -91,5 +89,3 @@
}
@end
-
-#endif // OMIT_TIGER_FEATURES
1.13 +0 -4 WebKit/WebView.subproj/WebPDFView.h
Index: WebPDFView.h
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebPDFView.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- WebPDFView.h 1 Aug 2005 17:50:35 -0000 1.12
+++ WebPDFView.h 16 Aug 2005 19:03:35 -0000 1.13
@@ -26,8 +26,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef OMIT_TIGER_FEATURES
-
@class PDFView;
@class WebDataSource;
@class PDFPrefUpdatingProxy;
@@ -51,5 +49,3 @@
- (PDFView *)PDFSubview;
@end
-
-#endif // OMIT_TIGER_FEATURES
1.25 +0 -4 WebKit/WebView.subproj/WebPDFView.m
Index: WebPDFView.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebPDFView.m,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- WebPDFView.m 1 Aug 2005 17:50:35 -0000 1.24
+++ WebPDFView.m 16 Aug 2005 19:03:35 -0000 1.25
@@ -26,8 +26,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef OMIT_TIGER_FEATURES
-
#import <WebKit/WebAssertions.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebDocumentInternal.h>
@@ -748,5 +746,3 @@
}
@end
-
-#endif // OMIT_TIGER_FEATURES
1.97 +1 -28 WebKit/WebView.subproj/WebPreferences.m
Index: WebPreferences.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebPreferences.m,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- WebPreferences.m 1 Aug 2005 17:50:35 -0000 1.96
+++ WebPreferences.m 16 Aug 2005 19:03:35 -0000 1.97
@@ -701,34 +701,7 @@
+ (CFStringEncoding)_systemCFStringEncoding
{
-#if OMIT_TIGER_FEATURES
- CFStringEncoding encoding = CFStringGetSystemEncoding();
-
- // Map from system encodings to the appropriate default web encoding.
- // Web pages that are not labeled will be decoded assuming this encoding,
- // so it's important that this be the most likely encoding to encounter
- // on a web page. MacArabic, MacHebrew, and MacRoman are not common on
- // the web, so instead we map to the most common similar encoding actually used.
- switch (encoding) {
- case kCFStringEncodingMacArabic:
- encoding = kCFStringEncodingDOSArabic;
- break;
- case kCFStringEncodingMacHebrew:
- encoding = kCFStringEncodingDOSHebrew;
- break;
- case kCFStringEncodingMacRoman:
- encoding = kCFStringEncodingISOLatin1;
- break;
- }
-
- // We must not use any encoding that has no IANA character set name.
- if (CFStringConvertEncodingToIANACharSetName(encoding) == NULL)
- encoding = kCFStringEncodingISOLatin1;
-#else
- CFStringEncoding encoding = WKGetWebDefaultCFStringEncoding();
-#endif
-
- return encoding;
+ return WKGetWebDefaultCFStringEncoding();
}
+ (void)_setInitialDefaultTextEncodingToSystemEncoding
1.302 +2 -7 WebKit/WebView.subproj/WebView.m
Index: WebView.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebView.m,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -r1.301 -r1.302
--- WebView.m 14 Aug 2005 09:12:48 -0000 1.301
+++ WebView.m 16 Aug 2005 19:03:35 -0000 1.302
@@ -1532,18 +1532,13 @@
[types release];
}
-#if !BUILDING_ON_PANTHER
-static bool CGContextInitialized = false;
-#endif
-
- (void)_commonInitializationWithFrameName:(NSString *)frameName groupName:(NSString *)groupName
{
-#if !BUILDING_ON_PANTHER
+ static bool CGContextInitialized = false;
if (!CGContextInitialized) {
- WKDisableCGDeferredUpdates();
+ WKDisableCGDeferredUpdates();
CGContextInitialized = true;
}
-#endif
_private->drawsBackground = YES;
_private->smartInsertDeleteEnabled = YES;
More information about the webkit-changes
mailing list