[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:31:13 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 7400f7daba3784d3388f5c1cb2071836ae1231fc
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Aug 14 15:07:45 2002 +0000
Remove some unused things. Fix minor problems.
* Plugins.subproj/WebPluginNullEventSender.m:
* Plugins.subproj/WebPluginView.m:
* WebCoreSupport.subproj/WebTextRenderer.m:
Fixed places that were using the C++ bool instead of
the Objective C BOOL.
* WebView.subproj/WebDataSourcePrivate.m: (-[WebDataSource _receivedData:]):
Remove old code related to the dummy data source.
* WebView.subproj/WebFrame.m:
(-[WebFrame initWithName:webView:provisionalDataSource:controller:]):
Remove _changeBridge, since we don't any more. Hoist the creation of the
bridge up here.
* WebView.subproj/WebFramePrivate.h: Remove _changeBridge.
* WebView.subproj/WebFramePrivate.m: Remove _changeBridge.
* WebView.subproj/WebHTMLRepresentation.h:
* WebView.subproj/WebHTMLView.h:
* WebView.subproj/WebImageRepresentation.h:
* WebView.subproj/WebTextRepresentation.h:
* WebView.subproj/WebTextView.h:
Don't re-declare methods that are part of protocols we implement.
* WebView.subproj/WebHTMLView.m:
(-[WebHTMLView initWithFrame:]): Don't add the mouse moved observer until
the view gets put into a window.
(-[WebHTMLView addMouseMovedObserver]): Added.
(-[WebHTMLView removeMouseMovedObserver]): Added.
(-[WebHTMLView viewWillMoveToWindow:]): Remove observer if we were in the
main window.
(-[WebHTMLView viewDidMoveToWindow]): Add observer if we are now in the main
window.
* WebView.subproj/WebHTMLViewPrivate.h: Add _frame method. Remove unused
controller and cursor instance variables.
* WebView.subproj/WebHTMLViewPrivate.m:
(-[WebHTMLView _frame]): Added.
(-[WebHTMLView _bridge]): Call _frame.
* WebView.subproj/WebTextRepresentation.m: Add now-needed import.
* WebView.subproj/WebHTMLRepresentation.m: Tweak.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1816 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 5a56951..fc4fea2 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,49 @@
+2002-08-14 Darin Adler <darin at apple.com>
+
+ Remove some unused things. Fix minor problems.
+
+ * Plugins.subproj/WebPluginNullEventSender.m:
+ * Plugins.subproj/WebPluginView.m:
+ * WebCoreSupport.subproj/WebTextRenderer.m:
+ Fixed places that were using the C++ bool instead of
+ the Objective C BOOL.
+
+ * WebView.subproj/WebDataSourcePrivate.m: (-[WebDataSource _receivedData:]):
+ Remove old code related to the dummy data source.
+
+ * WebView.subproj/WebFrame.m:
+ (-[WebFrame initWithName:webView:provisionalDataSource:controller:]):
+ Remove _changeBridge, since we don't any more. Hoist the creation of the
+ bridge up here.
+ * WebView.subproj/WebFramePrivate.h: Remove _changeBridge.
+ * WebView.subproj/WebFramePrivate.m: Remove _changeBridge.
+
+ * WebView.subproj/WebHTMLRepresentation.h:
+ * WebView.subproj/WebHTMLView.h:
+ * WebView.subproj/WebImageRepresentation.h:
+ * WebView.subproj/WebTextRepresentation.h:
+ * WebView.subproj/WebTextView.h:
+ Don't re-declare methods that are part of protocols we implement.
+
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView initWithFrame:]): Don't add the mouse moved observer until
+ the view gets put into a window.
+ (-[WebHTMLView addMouseMovedObserver]): Added.
+ (-[WebHTMLView removeMouseMovedObserver]): Added.
+ (-[WebHTMLView viewWillMoveToWindow:]): Remove observer if we were in the
+ main window.
+ (-[WebHTMLView viewDidMoveToWindow]): Add observer if we are now in the main
+ window.
+ * WebView.subproj/WebHTMLViewPrivate.h: Add _frame method. Remove unused
+ controller and cursor instance variables.
+ * WebView.subproj/WebHTMLViewPrivate.m:
+ (-[WebHTMLView _frame]): Added.
+ (-[WebHTMLView _bridge]): Call _frame.
+
+ * WebView.subproj/WebTextRepresentation.m: Add now-needed import.
+
+ * WebView.subproj/WebHTMLRepresentation.m: Tweak.
+
2002-08-13 Maciej Stachowiak <mjs at apple.com>
Add the ability to determine the classes of live JavaScript
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 5a56951..fc4fea2 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,49 @@
+2002-08-14 Darin Adler <darin at apple.com>
+
+ Remove some unused things. Fix minor problems.
+
+ * Plugins.subproj/WebPluginNullEventSender.m:
+ * Plugins.subproj/WebPluginView.m:
+ * WebCoreSupport.subproj/WebTextRenderer.m:
+ Fixed places that were using the C++ bool instead of
+ the Objective C BOOL.
+
+ * WebView.subproj/WebDataSourcePrivate.m: (-[WebDataSource _receivedData:]):
+ Remove old code related to the dummy data source.
+
+ * WebView.subproj/WebFrame.m:
+ (-[WebFrame initWithName:webView:provisionalDataSource:controller:]):
+ Remove _changeBridge, since we don't any more. Hoist the creation of the
+ bridge up here.
+ * WebView.subproj/WebFramePrivate.h: Remove _changeBridge.
+ * WebView.subproj/WebFramePrivate.m: Remove _changeBridge.
+
+ * WebView.subproj/WebHTMLRepresentation.h:
+ * WebView.subproj/WebHTMLView.h:
+ * WebView.subproj/WebImageRepresentation.h:
+ * WebView.subproj/WebTextRepresentation.h:
+ * WebView.subproj/WebTextView.h:
+ Don't re-declare methods that are part of protocols we implement.
+
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView initWithFrame:]): Don't add the mouse moved observer until
+ the view gets put into a window.
+ (-[WebHTMLView addMouseMovedObserver]): Added.
+ (-[WebHTMLView removeMouseMovedObserver]): Added.
+ (-[WebHTMLView viewWillMoveToWindow:]): Remove observer if we were in the
+ main window.
+ (-[WebHTMLView viewDidMoveToWindow]): Add observer if we are now in the main
+ window.
+ * WebView.subproj/WebHTMLViewPrivate.h: Add _frame method. Remove unused
+ controller and cursor instance variables.
+ * WebView.subproj/WebHTMLViewPrivate.m:
+ (-[WebHTMLView _frame]): Added.
+ (-[WebHTMLView _bridge]): Call _frame.
+
+ * WebView.subproj/WebTextRepresentation.m: Add now-needed import.
+
+ * WebView.subproj/WebHTMLRepresentation.m: Tweak.
+
2002-08-13 Maciej Stachowiak <mjs at apple.com>
Add the ability to determine the classes of live JavaScript
diff --git a/WebKit/Plugins.subproj/WebPluginNullEventSender.m b/WebKit/Plugins.subproj/WebPluginNullEventSender.m
index f84be7b..199e55f 100644
--- a/WebKit/Plugins.subproj/WebPluginNullEventSender.m
+++ b/WebKit/Plugins.subproj/WebPluginNullEventSender.m
@@ -32,7 +32,7 @@
{
if (!shouldStop) {
EventRecord event;
- bool acceptedEvent;
+ BOOL acceptedEvent;
[WebPluginView getCarbonEvent:&event];
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index 3fbd060..0a1c5d0 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -113,7 +113,7 @@
-(void)sendActivateEvent:(BOOL)activate
{
EventRecord event;
- bool acceptedEvent;
+ BOOL acceptedEvent;
[self getCarbonEvent:&event];
event.what = activateEvt;
@@ -130,7 +130,7 @@
- (void)sendUpdateEvent
{
EventRecord event;
- bool acceptedEvent;
+ BOOL acceptedEvent;
[self getCarbonEvent:&event];
event.what = updateEvt;
@@ -150,7 +150,7 @@
- (BOOL)becomeFirstResponder
{
EventRecord event;
- bool acceptedEvent;
+ BOOL acceptedEvent;
[self getCarbonEvent:&event];
event.what = getFocusEvent;
@@ -164,7 +164,7 @@
- (BOOL)resignFirstResponder
{
EventRecord event;
- bool acceptedEvent;
+ BOOL acceptedEvent;
[self getCarbonEvent:&event];
event.what = loseFocusEvent;
@@ -179,7 +179,7 @@
-(void)mouseDown:(NSEvent *)theEvent
{
EventRecord event;
- bool acceptedEvent;
+ BOOL acceptedEvent;
[self getCarbonEvent:&event withEvent:theEvent];
event.what = mouseDown;
@@ -192,7 +192,7 @@
-(void)mouseUp:(NSEvent *)theEvent
{
EventRecord event;
- bool acceptedEvent;
+ BOOL acceptedEvent;
[self getCarbonEvent:&event withEvent:theEvent];
event.what = mouseUp;
@@ -205,7 +205,7 @@
- (void)mouseEntered:(NSEvent *)theEvent
{
EventRecord event;
- bool acceptedEvent;
+ BOOL acceptedEvent;
[self getCarbonEvent:&event withEvent:theEvent];
event.what = adjustCursorEvent;
@@ -218,7 +218,7 @@
- (void)mouseExited:(NSEvent *)theEvent
{
EventRecord event;
- bool acceptedEvent;
+ BOOL acceptedEvent;
[self getCarbonEvent:&event withEvent:theEvent];
event.what = adjustCursorEvent;
@@ -234,7 +234,7 @@
- (void)keyUp:(NSEvent *)theEvent
{
EventRecord event;
- bool acceptedEvent;
+ BOOL acceptedEvent;
[self getCarbonEvent:&event withEvent:theEvent];
event.what = keyUp;
@@ -258,7 +258,7 @@
- (void)keyDown:(NSEvent *)theEvent
{
EventRecord event;
- bool acceptedEvent;
+ BOOL acceptedEvent;
// Some command keys are sent with both performKeyEquivalent and keyDown.
// We should send only 1 keyDown to the plug-in, so we'll ignore this one.
@@ -301,7 +301,7 @@
- (BOOL)performKeyEquivalent:(NSEvent *)theEvent
{
EventRecord event;
- bool acceptedEvent;
+ BOOL acceptedEvent;
if(![self isInResponderChain]){
return NO;
@@ -326,7 +326,7 @@
- (NSMenu *)menuForEvent:(NSEvent *)theEvent
{
EventRecord event;
- bool acceptedEvent;
+ BOOL acceptedEvent;
[self getCarbonEvent:&event withEvent:theEvent];
acceptedEvent = NPP_HandleEvent(instance, &event);
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
index 0fe70b1..b8ead75 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
@@ -134,7 +134,7 @@ static double totalCGGetAdvancesTime = 0;
static inline WebGlyphWidth widthForGlyph (WebTextRenderer *renderer, WidthMap *map, ATSGlyphRef glyph)
{
WebGlyphWidth width;
- bool errorResult;
+ BOOL errorResult;
if (map == 0){
map = [renderer extendGlyphToWidthMapToInclude: glyph];
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 82de2b1..4977d6c 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -433,12 +433,7 @@
_private->gotFirstByte = YES;
[self _commitIfReady];
- // FIXME: remove the conditional check, which exists to avoid jiggling the part
- // the wrong way, when we change to the frame owning the bridge, and not needing
- // a dummy data source to create one.
- if ([data length] > 0) {
- [[self representation] receivedData:data withDataSource:self];
- }
+ [[self representation] receivedData:data withDataSource:self];
[[[[self webFrame] webView] documentView] dataSourceUpdated:self];
}
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 55141cb..288bc47 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -38,7 +38,8 @@
[self setController: c];
- [self _changeBridge];
+ _private->bridge = [[WebBridge alloc] init];
+ [_private->bridge setFrame:self];
if (d != nil && [self setProvisionalDataSource: d] == NO){
[self release];
diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
index 9d7b6eb..c16d933 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.h
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -86,7 +86,6 @@ typedef enum {
- (void)_isLoadComplete;
- (void)_checkLoadComplete;
- (void)_timedLayout: userInfo;
-- (void)_changeBridge;
- (WebBridge *)_bridge;
- (BOOL)_shouldShowDataSource:(WebDataSource *)dataSource;
- (void)_setProvisionalDataSource:(WebDataSource *)d;
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 18135d2..a7bf6de 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -535,19 +535,6 @@ static const char * const stateNames[] = {
[WebFrame _recursiveCheckCompleteFromFrame: [[self controller] mainFrame]];
}
-- (void)_changeBridge
-{
- WebBridge *oldBridge = _private->bridge;
- //[oldBridge removeFromFrame];
- _private->bridge = [[WebBridge alloc] init];
- [_private->bridge setFrame:self];
- if ([oldBridge renderPart] != nil) {
- [_private->bridge setRenderPart:[oldBridge renderPart]];
- }
-
- [oldBridge release];
-}
-
- (WebBridge *)_bridge
{
return _private->bridge;
diff --git a/WebKit/WebView.subproj/WebHTMLRepresentation.h b/WebKit/WebView.subproj/WebHTMLRepresentation.h
index 1a97b58..69ef0e5 100644
--- a/WebKit/WebView.subproj/WebHTMLRepresentation.h
+++ b/WebKit/WebView.subproj/WebHTMLRepresentation.h
@@ -5,19 +5,11 @@
#import <Foundation/Foundation.h>
- at class WebError;
- at class WebDataSource;
-
@protocol WebDocumentRepresentation;
-
@class WebHTMLRepresentationPrivate;
@interface WebHTMLRepresentation : NSObject <WebDocumentRepresentation>
{
WebHTMLRepresentationPrivate *_private;
}
-
-- (void)receivedData:(NSData *)data withDataSource:(WebDataSource *)dataSource;
-- (void)receivedError:(WebError *)error withDataSource:(WebDataSource *)dataSource;
-- (void)finishedLoadingWithDataSource:(WebDataSource *)dataSource;
@end
diff --git a/WebKit/WebView.subproj/WebHTMLRepresentation.m b/WebKit/WebView.subproj/WebHTMLRepresentation.m
index a397feb..213106b 100644
--- a/WebKit/WebView.subproj/WebHTMLRepresentation.m
+++ b/WebKit/WebView.subproj/WebHTMLRepresentation.m
@@ -52,7 +52,6 @@
_private->bridge = [[dataSource webFrame] _bridge];
}
-
- (void)receivedData:(NSData *)data withDataSource:(WebDataSource *)dataSource
{
[_private->bridge receivedData:data withDataSource:dataSource];
@@ -60,12 +59,10 @@
- (void)receivedError:(WebError *)error withDataSource:(WebDataSource *)dataSource
{
-
}
- (void)finishedLoadingWithDataSource:(WebDataSource *)dataSource
{
-
}
@end
diff --git a/WebKit/WebView.subproj/WebHTMLView.h b/WebKit/WebView.subproj/WebHTMLView.h
index fe7c3d4..3ae6a04 100644
--- a/WebKit/WebView.subproj/WebHTMLView.h
+++ b/WebKit/WebView.subproj/WebHTMLView.h
@@ -24,35 +24,16 @@
- initWithFrame: (NSRect)frame;
-// These methods is typically called by the view's controller when
-// the data source is changed.
-- (void)provisionalDataSourceChanged:(WebDataSource *)dataSource;
-- (void)provisionalDataSourceCommitted:(WebDataSource *)dataSource;
-- (void)dataSourceUpdated:(WebDataSource *)dataSource;
-
-- (void)setNeedsLayout: (bool)flag;
-
-// This method should not be public until we have a more completely
-// understood way to subclass WebView.
-- (void)layout;
+- (void)setNeedsLayout: (BOOL)flag;
// Set needsToApplyStyles if you change anything that might impact styles, like
// font preferences.
-- (void)setNeedsToApplyStyles: (bool)flag;
+- (void)setNeedsToApplyStyles: (BOOL)flag;
// Reapplies style information to the document. This should not be called directly,
// instead call setNeedsToApplyStyles:.
- (void)reapplyStyles;
-// Stop animating animated GIFs, etc.
-- (void)stopAnimations;
-
-// Drag and drop links and images. Others?
-- (void)setCanDragFrom: (BOOL)flag;
-- (BOOL)canDragFrom;
-- (void)setCanDragTo: (BOOL)flag;
-- (BOOL)canDragTo;
-
// Returns an array of built-in context menu items for this node.
// Generally called by WebContextMenuHandlers from contextMenuItemsForNode:
#ifdef TENTATIVE_API
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index fd55069..7c85a43 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -35,14 +35,10 @@
_private->canDragTo = YES;
_private->canDragFrom = YES;
- // We added add/remove this view as a mouse moved observer when its window becomes/resigns main.
+ // We will add/remove this view as a mouse moved observer when its window becomes/resigns main.
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(windowDidBecomeMain:) name: NSWindowDidBecomeMainNotification object: nil];
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(windowDidResignMain:) name: NSWindowDidResignMainNotification object: nil];
- // Add this view initially as a mouse move observer. Subsequently we will add/remove this view
- // when the window becomes/resigns main.
- [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(mouseMovedNotification:) name: NSMouseMovedNotification object: nil];
-
return self;
}
@@ -62,8 +58,8 @@
return;
}
- // Note: can't use writeSelectionToPasteboard:type: here, though it seems equivalent, because
- // it doesn't declare the types to the pasteboard and thus doesn't bump the change count
+ // Note: Can't use writeSelectionToPasteboard:type: here, though it seems equivalent, because
+ // it doesn't declare the types to the pasteboard and thus doesn't bump the change count.
findPasteboard = [NSPasteboard pasteboardWithName:NSFindPboard];
[findPasteboard declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:self];
[findPasteboard setString:[[self _bridge] selectedText] forType:NSStringPboardType];
@@ -71,18 +67,15 @@
- (void)copy:(id)sender
{
- WebBridge *bridge = [self _bridge];
NSPasteboard *pboard = [NSPasteboard generalPasteboard];
-
[pboard declareTypes:[NSArray arrayWithObjects:NSStringPboardType, nil] owner:nil];
- [pboard setString:[bridge selectedText] forType:NSStringPboardType];
+ [pboard setString:[[self _bridge] selectedText] forType:NSStringPboardType];
}
- (void)selectAll: sender
{
- WebBridge *bridge = [self _bridge];
- [bridge selectAll];
+ [[self _bridge] selectAll];
}
- (void)jumpToSelection: sender
@@ -120,18 +113,36 @@
return YES;
}
+- (void)addMouseMovedObserver
+{
+ [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(mouseMovedNotification:) name: NSMouseMovedNotification object: nil];
+}
-- (void)removeNotifications
+- (void)removeMouseMovedObserver
{
[[NSNotificationCenter defaultCenter] removeObserver: self name: NSMouseMovedNotification object: nil];
+}
+
+- (void)removeNotifications
+{
+ [self removeMouseMovedObserver];
[[NSNotificationCenter defaultCenter] removeObserver: self name: NSWindowDidResignMainNotification object: nil];
[[NSNotificationCenter defaultCenter] removeObserver: self name: NSWindowDidResignMainNotification object: nil];
}
+- (void)viewWillMoveToWindow:(NSWindow *)window
+{
+ if ([[self window] isMainWindow]) {
+ [self removeMouseMovedObserver];
+ }
+}
- (void)viewDidMoveToWindow
{
if ([self window]) {
+ if ([[self window] isMainWindow]) {
+ [self addMouseMovedObserver];
+ }
_private->inWindow = YES;
} else {
// Reset when we are moved out of a window after being moved into one.
@@ -147,9 +158,7 @@
[super viewDidMoveToWindow];
}
-
-// This method is typically called by the view's controller when
-// the data source is changed.
+// This method is typically called by the view's controller when the data source is changed.
- (void)provisionalDataSourceChanged:(WebDataSource *)dataSource
{
[[dataSource _bridge]
@@ -216,13 +225,6 @@
}
-// Stop animating animated GIFs, etc.
-- (void)stopAnimations
-{
- [NSException raise:WebMethodNotYetImplemented format:@"WebView::stopAnimations is not implemented"];
-}
-
-
// Drag and drop links and images. Others?
- (void)setCanDragFrom: (BOOL)flag
{
@@ -326,14 +328,14 @@
}
-- (void)setNeedsLayout: (bool)flag
+- (void)setNeedsLayout: (BOOL)flag
{
WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "%s flag = %d\n", DEBUG_OBJECT(self), (int)flag);
_private->needsLayout = flag;
}
-- (void)setNeedsToApplyStyles: (bool)flag
+- (void)setNeedsToApplyStyles: (BOOL)flag
{
WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "%s flag = %d\n", DEBUG_OBJECT(self), (int)flag);
_private->needsToApplyStyles = flag;
@@ -402,14 +404,16 @@
- (void)windowDidBecomeMain: (NSNotification *)notification
{
- if ([notification object] == [self window])
- [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(mouseMovedNotification:) name: NSMouseMovedNotification object: nil];
+ if ([notification object] == [self window]) {
+ [self addMouseMovedObserver];
+ }
}
- (void)windowDidResignMain: (NSNotification *)notification
{
- if ([notification object] == [self window])
- [[NSNotificationCenter defaultCenter] removeObserver: self name: NSMouseMovedNotification object: nil];
+ if ([notification object] == [self window]) {
+ [self removeMouseMovedObserver];
+ }
}
- (void)mouseDown: (NSEvent *)event
@@ -513,7 +517,7 @@
#endif
-- (unsigned int)draggingSourceOperationMaskForLocal:(BOOL)isLocal
+- (unsigned)draggingSourceOperationMaskForLocal:(BOOL)isLocal
{
return NSDragOperationCopy;
}
@@ -534,25 +538,21 @@
- (void)setTextEncoding:(CFStringEncoding)encoding
{
- WebView *webView = [self _web_parentWebView];
- WebFrame *webFrame = [[webView _controller] frameForView:webView];
- [webFrame reload:NO];
- [[webFrame provisionalDataSource] _setOverrideEncoding:encoding];
+ WebFrame *frame = [self _frame];
+ [frame reload:NO];
+ [[frame provisionalDataSource] _setOverrideEncoding:encoding];
}
- (void)setDefaultTextEncoding
{
- WebView *webView = [self _web_parentWebView];
- WebFrame *webFrame = [[webView _controller] frameForView:webView];
- [webFrame reload:NO];
- [[webFrame provisionalDataSource] _setOverrideEncoding:kCFStringEncodingInvalidId];
+ WebFrame *frame = [self _frame];
+ [frame reload:NO];
+ [[frame provisionalDataSource] _setOverrideEncoding:kCFStringEncodingInvalidId];
}
- (BOOL)usingDefaultTextEncoding
{
- WebView *webView = [self _web_parentWebView];
- WebFrame *webFrame = [[webView _controller] frameForView:webView];
- return [[webFrame dataSource] _overrideEncoding] == kCFStringEncodingInvalidId;
+ return [[[self _frame] dataSource] _overrideEncoding] == kCFStringEncodingInvalidId;
}
@end
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.h b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
index 9e81126..597b7d9 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.h
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
@@ -10,16 +10,15 @@
@class WebBridge;
@class WebController;
+ at class WebFrame;
@interface WebHTMLViewPrivate : NSObject
{
@public
- WebController *controller;
BOOL needsLayout;
BOOL needsToApplyStyles;
BOOL canDragTo;
BOOL canDragFrom;
- NSCursor *cursor;
BOOL liveAllowsScrolling;
BOOL inWindow;
NSURL *draggedURL;
@@ -29,7 +28,7 @@
@interface WebHTMLView (WebPrivate)
- (void)_reset;
- (WebController *)_controller;
-- (void)_setController: (WebController *)controller;
+- (WebFrame *)_frame;
- (WebBridge *)_bridge;
- (void)_adjustFrames;
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index f3884e3..f955387 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -38,7 +38,6 @@
- (void)dealloc
{
- [cursor release];
[draggedURL release];
[super dealloc];
}
@@ -56,7 +55,6 @@
[[self _bridge] adjustFrames:[self frame]];
}
-
- (void)_reset
{
NSArray *subviews = [[self subviews] copy];
@@ -66,24 +64,21 @@
[WebImageRenderer stopAnimationsInView:self];
}
-//FIXME: WebHTMLView doesn't seem to use _private->controller so is _setController needed?
-- (void)_setController:(WebController *)controller
+- (WebController *)_controller
{
- // Not retained; the controller owns the view.
- _private->controller = controller;
+ return [[self _web_parentWebView] _controller];
}
-- (WebController *)_controller
+- (WebFrame *)_frame
{
- return [[self _web_parentWebView] _controller];
+ WebView *webView = [self _web_parentWebView];
+ return [[webView _controller] frameForView:webView];
}
// Required so view can access the part's selection.
- (WebBridge *)_bridge
{
- WebView *webView = [self _web_parentWebView];
- WebFrame *webFrame = [[webView _controller] frameForView:webView];
- return [webFrame _bridge];
+ return [[self _frame] _bridge];
}
BOOL _modifierTrackingEnabled = FALSE;
diff --git a/WebKit/WebView.subproj/WebImageRepresentation.h b/WebKit/WebView.subproj/WebImageRepresentation.h
index cd0df6d..f78590a 100644
--- a/WebKit/WebView.subproj/WebImageRepresentation.h
+++ b/WebKit/WebView.subproj/WebImageRepresentation.h
@@ -5,8 +5,6 @@
#import <Cocoa/Cocoa.h>
- at class WebError;
- at class WebDataSource;
@class WebImageRenderer;
@protocol WebDocumentRepresentation;
@@ -14,9 +12,5 @@
{
WebImageRenderer *image;
}
-
- (WebImageRenderer *)image;
-- (void)receivedData:(NSData *)data withDataSource:(WebDataSource *)dataSource;
-- (void)receivedError:(WebError *)error withDataSource:(WebDataSource *)dataSource;
-- (void)finishedLoadingWithDataSource:(WebDataSource *)dataSource;
@end
diff --git a/WebKit/WebView.subproj/WebTextRepresentation.h b/WebKit/WebView.subproj/WebTextRepresentation.h
index bc1875c..4ce6225 100644
--- a/WebKit/WebView.subproj/WebTextRepresentation.h
+++ b/WebKit/WebView.subproj/WebTextRepresentation.h
@@ -5,16 +5,9 @@
#import <Foundation/Foundation.h>
- at class WebError;
- at class WebDataSource;
@protocol WebDocumentRepresentation;
@interface WebTextRepresentation : NSObject <WebDocumentRepresentation>
{
-
}
-
-- (void)receivedData:(NSData *)data withDataSource:(WebDataSource *)dataSource;
-- (void)receivedError:(WebError *)error withDataSource:(WebDataSource *)dataSource;
-- (void)finishedLoadingWithDataSource:(WebDataSource *)dataSource;
@end
diff --git a/WebKit/WebView.subproj/WebTextRepresentation.m b/WebKit/WebView.subproj/WebTextRepresentation.m
index b35caac..3ebafa4 100644
--- a/WebKit/WebView.subproj/WebTextRepresentation.m
+++ b/WebKit/WebView.subproj/WebTextRepresentation.m
@@ -5,6 +5,7 @@
#import "WebTextRepresentation.h"
+#import <WebKit/WebDataSource.h>
@implementation WebTextRepresentation
diff --git a/WebKit/WebView.subproj/WebTextView.h b/WebKit/WebView.subproj/WebTextView.h
index 4331fe8..cd621ab 100644
--- a/WebKit/WebView.subproj/WebTextView.h
+++ b/WebKit/WebView.subproj/WebTextView.h
@@ -5,7 +5,6 @@
#import <Cocoa/Cocoa.h>
- at class WebDataSource;
@protocol WebDocumentLoading;
@protocol WebDocumentDragSettings;
@protocol WebDocumentSearching;
@@ -15,15 +14,4 @@
BOOL canDragFrom;
BOOL canDragTo;
}
-
-- (void)provisionalDataSourceChanged:(WebDataSource *)dataSource;
-- (void)provisionalDataSourceCommitted:(WebDataSource *)dataSource;
-- (void)dataSourceUpdated:(WebDataSource *)dataSource;
-- (void)layout;
-
-- (void)setCanDragFrom: (BOOL)flag;
-- (BOOL)canDragFrom;
-- (void)setCanDragTo: (BOOL)flag;
-- (BOOL)canDragTo;
-
@end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list