[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
rjw
rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:12:49 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 25635058386b88901228e8cc2a872f43680f0317
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed May 15 01:59:33 2002 +0000
Fixed 2926153, not getting correct messages after cancel.
Fixed leak of mouse events (Darin wanted this ASAP).
Added another symbol for stack based event constructor.
Change to support onLoad.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1150 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 729a922..2d42c2b 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-05-14 Richard J. Williamson <rjw at apple.com>
+
+ Added another symbol for stack based event constructor.
+ Change to support onLoad.
+
+ * kwq/KWQKHTMLPart.mm:
+ (KHTMLPart::end):
+ * libwebcore.exp:
+
2002-05-14 Chris Blumenberg <cblu at apple.com>
Changed slotData to slotData(NSString *encoding, const char *bytes, int length)
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 729a922..2d42c2b 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2002-05-14 Richard J. Williamson <rjw at apple.com>
+
+ Added another symbol for stack based event constructor.
+ Change to support onLoad.
+
+ * kwq/KWQKHTMLPart.mm:
+ (KHTMLPart::end):
+ * libwebcore.exp:
+
2002-05-14 Chris Blumenberg <cblu at apple.com>
Changed slotData to slotData(NSString *encoding, const char *bytes, int length)
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 729a922..2d42c2b 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2002-05-14 Richard J. Williamson <rjw at apple.com>
+
+ Added another symbol for stack based event constructor.
+ Change to support onLoad.
+
+ * kwq/KWQKHTMLPart.mm:
+ (KHTMLPart::end):
+ * libwebcore.exp:
+
2002-05-14 Chris Blumenberg <cblu at apple.com>
Changed slotData to slotData(NSString *encoding, const char *bytes, int length)
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 71ea7b0..826f0f9 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -655,10 +655,11 @@ void KHTMLPart::end()
d->m_doc->finishParsing();
#endif /* not APPLE_CHANGES */
+ d->m_doc->setParsing(false);
+
d->m_doc->close();
KURL::clearCaches();
- d->m_doc->setParsing(false);
d->m_view->complete();
}
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 71ea7b0..826f0f9 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -655,10 +655,11 @@ void KHTMLPart::end()
d->m_doc->finishParsing();
#endif /* not APPLE_CHANGES */
+ d->m_doc->setParsing(false);
+
d->m_doc->close();
KURL::clearCaches();
- d->m_doc->setParsing(false);
d->m_view->complete();
}
diff --git a/WebCore/libwebcore.exp b/WebCore/libwebcore.exp
index 7104083..a9e4308 100644
--- a/WebCore/libwebcore.exp
+++ b/WebCore/libwebcore.exp
@@ -12,6 +12,7 @@ __ZN5khtml5Cache13getStatisticsEv
__ZN5khtml5Cache16setCacheDisabledEb
__ZN5khtml5Cache8flushAllEv
__ZN6QPointC1Eii
+__ZN6QEventD2Ev
__ZN7QStringD1Ev
__ZN7QWidget7setViewEP6NSView
__ZN8QPainterC1EP7QWidget
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 38c2f59..afdef62 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,19 @@
+2002-05-14 Richard J. Williamson <rjw at apple.com>
+
+ Fixed 2926153, not getting correct messages after cancel.
+ Fixed leak of mouse events (Darin wanted this ASAP).
+
+ * WebView.subproj/IFBaseWebControllerPrivate.mm:
+ (-[IFBaseWebController _receivedProgress:forResource:fromDataSource:]):
+ (-[IFBaseWebController _mainReceivedProgress:forResource:fromDataSource:]):
+ * WebView.subproj/IFLocationChangeHandler.h:
+ * WebView.subproj/IFWebView.mm:
+ (-[IFWebView initWithFrame:]):
+ (-[IFWebView layout]):
+ (-[IFWebView mouseUp:]):
+ (-[IFWebView mouseDown:]):
+ (-[IFWebView mouseMovedNotification:]):
+
2002-05-14 Chris Blumenberg <cblu at apple.com>
Removed retain of the URL handle. This was causing everything to leak.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 38c2f59..afdef62 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,19 @@
+2002-05-14 Richard J. Williamson <rjw at apple.com>
+
+ Fixed 2926153, not getting correct messages after cancel.
+ Fixed leak of mouse events (Darin wanted this ASAP).
+
+ * WebView.subproj/IFBaseWebControllerPrivate.mm:
+ (-[IFBaseWebController _receivedProgress:forResource:fromDataSource:]):
+ (-[IFBaseWebController _mainReceivedProgress:forResource:fromDataSource:]):
+ * WebView.subproj/IFLocationChangeHandler.h:
+ * WebView.subproj/IFWebView.mm:
+ (-[IFWebView initWithFrame:]):
+ (-[IFWebView layout]):
+ (-[IFWebView mouseUp:]):
+ (-[IFWebView mouseDown:]):
+ (-[IFWebView mouseMovedNotification:]):
+
2002-05-14 Chris Blumenberg <cblu at apple.com>
Removed retain of the URL handle. This was causing everything to leak.
diff --git a/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm b/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm
index 7d5341c..b87ed37 100644
--- a/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm
+++ b/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm
@@ -70,6 +70,7 @@
WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "cancelled resource = %s\n", [[[dataSource inputURL] absoluteString] cString]);
if (frame != nil) {
IFError *error = [[IFError alloc] initWithErrorCode: IFURLHandleResultCancelled inDomain:IFErrorCodeDomainWebFoundation failingURL: [dataSource inputURL]];
+ [self receivedError: error forResource: resourceDescription partialProgress: progress fromDataSource: dataSource];
[dataSource _addError: error forResource: resourceDescription];
[error release];
[frame _checkLoadComplete];
@@ -97,12 +98,11 @@
if (progress->bytesSoFar == -1 && progress->totalToLoad == -1){
WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "cancelled resource = %s\n", [[[dataSource inputURL] absoluteString] cString]);
[dataSource _setPrimaryLoadComplete: YES];
- if (frame != nil) {
- IFError *error = [[IFError alloc] initWithErrorCode: IFURLHandleResultCancelled inDomain:IFErrorCodeDomainWebFoundation failingURL: [dataSource inputURL]];
- [dataSource _setMainDocumentError: error];
- [error release];
- [frame _checkLoadComplete];
- }
+ IFError *error = [[IFError alloc] initWithErrorCode: IFURLHandleResultCancelled inDomain:IFErrorCodeDomainWebFoundation failingURL: [dataSource inputURL]];
+ [self receivedError: error forResource: resourceDescription partialProgress: progress fromDataSource: dataSource];
+ [dataSource _setMainDocumentError: error];
+ [error release];
+ [frame _checkLoadComplete];
return;
}
diff --git a/WebKit/WebView.subproj/IFLocationChangeHandler.h b/WebKit/WebView.subproj/IFLocationChangeHandler.h
index f4ee53c..5dfc500 100644
--- a/WebKit/WebView.subproj/IFLocationChangeHandler.h
+++ b/WebKit/WebView.subproj/IFLocationChangeHandler.h
@@ -9,7 +9,6 @@
@class IFError;
@class IFWebDataSource;
- at class IFDownloadHandler;
/*
=============================================================================
diff --git a/WebKit/WebView.subproj/IFWebView.mm b/WebKit/WebView.subproj/IFWebView.mm
index 54650dc..1f55b2d 100644
--- a/WebKit/WebView.subproj/IFWebView.mm
+++ b/WebKit/WebView.subproj/IFWebView.mm
@@ -12,6 +12,9 @@
#import <WebKit/IFTextRendererFactory.h>
#import <WebKit/WebKitDebug.h>
+// Needed for the mouse move notification.
+#import <Appkit/NSResponder_Private.h>
+
// KDE related includes
#import <khtmlview.h>
#import <qwidget.h>
@@ -34,7 +37,9 @@
_private->isFlipped = YES;
_private->needsLayout = YES;
+
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(windowResized:) name: NSWindowDidResizeNotification object: nil];
+ [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(mouseMovedNotification:) name: NSMouseMovedNotification object: nil];
return self;
}
@@ -147,7 +152,6 @@
}
-
// This method should not be public until we have more completely
// understood how IFWebView will be subclassed.
- (void)layout
@@ -157,6 +161,7 @@
// Ensure that we will receive mouse move events. Is this the best place to put this?
[[self window] setAcceptsMouseMovedEvents: YES];
+ [[self window] _setShouldPostEventNotifications: YES];
if (widget->part()->xmlDocImpl() &&
widget->part()->xmlDocImpl()->renderer()){
@@ -415,10 +420,10 @@
}
NSPoint p = [event locationInWindow];
- QMouseEvent *kEvent = new QMouseEvent(QEvent::MouseButtonPress, QPoint((int)p.x, (int)p.y), button, state);
+ QMouseEvent kEvent(QEvent::MouseButtonPress, QPoint((int)p.x, (int)p.y), button, state);
KHTMLView *widget = _private->widget;
if (widget != 0l) {
- widget->viewportMouseReleaseEvent(kEvent);
+ widget->viewportMouseReleaseEvent(&kEvent);
}
}
@@ -444,23 +449,22 @@
}
NSPoint p = [event locationInWindow];
- QMouseEvent *kEvent = new QMouseEvent(QEvent::MouseButtonPress, QPoint((int)p.x, (int)p.y), button, state);
+ QMouseEvent kEvent(QEvent::MouseButtonPress, QPoint((int)p.x, (int)p.y), button, state);
KHTMLView *widget = _private->widget;
if (widget != 0l) {
- widget->viewportMousePressEvent(kEvent);
+ widget->viewportMousePressEvent(&kEvent);
}
}
-// FIXME: This needs to use the mouse moved notification rather than the mouse moved event so
-// it works even when this view is not in the responder chain.
-- (void)mouseMoved: (NSEvent *)event
+- (void)mouseMovedNotification: (NSNotification *)notification
{
+ NSEvent *event = [(NSDictionary *)[notification userInfo] objectForKey: @"NSEvent"];
NSPoint p = [event locationInWindow];
- QMouseEvent *kEvent = new QMouseEvent(QEvent::MouseButtonPress, QPoint((int)p.x, (int)p.y), 0, 0);
+ QMouseEvent kEvent(QEvent::MouseButtonPress, QPoint((int)p.x, (int)p.y), 0, 0);
KHTMLView *widget = _private->widget;
if (widget != 0l) {
- widget->viewportMouseMoveEvent(kEvent);
+ widget->viewportMouseMoveEvent(&kEvent);
}
}
diff --git a/WebKit/WebView.subproj/WebFrameLoadDelegate.h b/WebKit/WebView.subproj/WebFrameLoadDelegate.h
index f4ee53c..5dfc500 100644
--- a/WebKit/WebView.subproj/WebFrameLoadDelegate.h
+++ b/WebKit/WebView.subproj/WebFrameLoadDelegate.h
@@ -9,7 +9,6 @@
@class IFError;
@class IFWebDataSource;
- at class IFDownloadHandler;
/*
=============================================================================
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 54650dc..1f55b2d 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -12,6 +12,9 @@
#import <WebKit/IFTextRendererFactory.h>
#import <WebKit/WebKitDebug.h>
+// Needed for the mouse move notification.
+#import <Appkit/NSResponder_Private.h>
+
// KDE related includes
#import <khtmlview.h>
#import <qwidget.h>
@@ -34,7 +37,9 @@
_private->isFlipped = YES;
_private->needsLayout = YES;
+
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(windowResized:) name: NSWindowDidResizeNotification object: nil];
+ [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(mouseMovedNotification:) name: NSMouseMovedNotification object: nil];
return self;
}
@@ -147,7 +152,6 @@
}
-
// This method should not be public until we have more completely
// understood how IFWebView will be subclassed.
- (void)layout
@@ -157,6 +161,7 @@
// Ensure that we will receive mouse move events. Is this the best place to put this?
[[self window] setAcceptsMouseMovedEvents: YES];
+ [[self window] _setShouldPostEventNotifications: YES];
if (widget->part()->xmlDocImpl() &&
widget->part()->xmlDocImpl()->renderer()){
@@ -415,10 +420,10 @@
}
NSPoint p = [event locationInWindow];
- QMouseEvent *kEvent = new QMouseEvent(QEvent::MouseButtonPress, QPoint((int)p.x, (int)p.y), button, state);
+ QMouseEvent kEvent(QEvent::MouseButtonPress, QPoint((int)p.x, (int)p.y), button, state);
KHTMLView *widget = _private->widget;
if (widget != 0l) {
- widget->viewportMouseReleaseEvent(kEvent);
+ widget->viewportMouseReleaseEvent(&kEvent);
}
}
@@ -444,23 +449,22 @@
}
NSPoint p = [event locationInWindow];
- QMouseEvent *kEvent = new QMouseEvent(QEvent::MouseButtonPress, QPoint((int)p.x, (int)p.y), button, state);
+ QMouseEvent kEvent(QEvent::MouseButtonPress, QPoint((int)p.x, (int)p.y), button, state);
KHTMLView *widget = _private->widget;
if (widget != 0l) {
- widget->viewportMousePressEvent(kEvent);
+ widget->viewportMousePressEvent(&kEvent);
}
}
-// FIXME: This needs to use the mouse moved notification rather than the mouse moved event so
-// it works even when this view is not in the responder chain.
-- (void)mouseMoved: (NSEvent *)event
+- (void)mouseMovedNotification: (NSNotification *)notification
{
+ NSEvent *event = [(NSDictionary *)[notification userInfo] objectForKey: @"NSEvent"];
NSPoint p = [event locationInWindow];
- QMouseEvent *kEvent = new QMouseEvent(QEvent::MouseButtonPress, QPoint((int)p.x, (int)p.y), 0, 0);
+ QMouseEvent kEvent(QEvent::MouseButtonPress, QPoint((int)p.x, (int)p.y), 0, 0);
KHTMLView *widget = _private->widget;
if (widget != 0l) {
- widget->viewportMouseMoveEvent(kEvent);
+ widget->viewportMouseMoveEvent(&kEvent);
}
}
diff --git a/WebKit/WebView.subproj/WebLocationChangeDelegate.h b/WebKit/WebView.subproj/WebLocationChangeDelegate.h
index f4ee53c..5dfc500 100644
--- a/WebKit/WebView.subproj/WebLocationChangeDelegate.h
+++ b/WebKit/WebView.subproj/WebLocationChangeDelegate.h
@@ -9,7 +9,6 @@
@class IFError;
@class IFWebDataSource;
- at class IFDownloadHandler;
/*
=============================================================================
diff --git a/WebKit/WebView.subproj/WebLocationChangeHandler.h b/WebKit/WebView.subproj/WebLocationChangeHandler.h
index f4ee53c..5dfc500 100644
--- a/WebKit/WebView.subproj/WebLocationChangeHandler.h
+++ b/WebKit/WebView.subproj/WebLocationChangeHandler.h
@@ -9,7 +9,6 @@
@class IFError;
@class IFWebDataSource;
- at class IFDownloadHandler;
/*
=============================================================================
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list