[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:59:00 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 3d0b472f3edc33e4b361d0a8527cd63cb0ad3d34
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 12 02:06:27 2002 +0000
WebCore:
- tighten up cursor handling a bit more
* kwq/KWQWidget.mm:
(QWidget::setCursor): Use setDocumentCursor: instead of our own protocol.
(QWidget::cursor): Use documentCursor instead of storing our own cursor.
* kwq/WebCoreFrameView.h: Remove setCursor: method.
WebKit:
- tighten up cursor handling a bit more
* WebView.subproj/WebDynamicScrollBarsView.m:
* WebView.subproj/WebHTMLView.m:
(-[WebHTMLView addMouseMovedObserver]): Call _frameOrBoundsChanged
so we emit a mouse moved event right away.
(-[WebHTMLView viewWillMoveToSuperview:]): Remove the colon since I
removed the parameter from _frameOrBoundsChanged.
* WebView.subproj/WebHTMLViewPrivate.h: Declare _frameOrBoundsChanged.
* WebView.subproj/WebHTMLViewPrivate.m:
(-[WebHTMLView _frameOrBoundsChanged]): Remove parameter.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2628 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 953cfcb..24716fc 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,15 @@
2002-11-11 Darin Adler <darin at apple.com>
+ - tighten up cursor handling a bit more
+
+ * kwq/KWQWidget.mm:
+ (QWidget::setCursor): Use setDocumentCursor: instead of our own protocol.
+ (QWidget::cursor): Use documentCursor instead of storing our own cursor.
+
+ * kwq/WebCoreFrameView.h: Remove setCursor: method.
+
+2002-11-11 Darin Adler <darin at apple.com>
+
- fixed 3084704 -- crash in HTMLTokenizer on page with JavaScript
HTMLDocument::Close inside a <script>
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 953cfcb..24716fc 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,15 @@
2002-11-11 Darin Adler <darin at apple.com>
+ - tighten up cursor handling a bit more
+
+ * kwq/KWQWidget.mm:
+ (QWidget::setCursor): Use setDocumentCursor: instead of our own protocol.
+ (QWidget::cursor): Use documentCursor instead of storing our own cursor.
+
+ * kwq/WebCoreFrameView.h: Remove setCursor: method.
+
+2002-11-11 Darin Adler <darin at apple.com>
+
- fixed 3084704 -- crash in HTMLTokenizer on page with JavaScript
HTMLDocument::Close inside a <script>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 953cfcb..24716fc 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
2002-11-11 Darin Adler <darin at apple.com>
+ - tighten up cursor handling a bit more
+
+ * kwq/KWQWidget.mm:
+ (QWidget::setCursor): Use setDocumentCursor: instead of our own protocol.
+ (QWidget::cursor): Use documentCursor instead of storing our own cursor.
+
+ * kwq/WebCoreFrameView.h: Remove setCursor: method.
+
+2002-11-11 Darin Adler <darin at apple.com>
+
- fixed 3084704 -- crash in HTMLTokenizer on page with JavaScript
HTMLDocument::Close inside a <script>
diff --git a/WebCore/kwq/KWQWidget.mm b/WebCore/kwq/KWQWidget.mm
index 1b70f20..c6ac55a 100644
--- a/WebCore/kwq/KWQWidget.mm
+++ b/WebCore/kwq/KWQWidget.mm
@@ -48,7 +48,6 @@ class QWidgetPrivate
public:
QStyle *style;
QFont font;
- QCursor cursor;
QPalette pal;
NSView *view;
};
@@ -287,12 +286,12 @@ bool QWidget::isVisible() const
void QWidget::setCursor(const QCursor &cur)
{
- data->cursor = cur;
-
id view = data->view;
while (view) {
- if ([view conformsToProtocol:@protocol(WebCoreFrameView)]) {
- [view setCursor:data->cursor.handle()];
+ if ([view respondsToSelector:@selector(setDocumentCursor:)]) {
+ printf("setting cursor to %p\n", cur.handle());
+ [view setDocumentCursor:cur.handle()];
+ break;
}
view = [view superview];
}
@@ -300,7 +299,14 @@ void QWidget::setCursor(const QCursor &cur)
QCursor QWidget::cursor()
{
- return data->cursor;
+ id view = data->view;
+ while (view) {
+ if ([view respondsToSelector:@selector(documentCursor)]) {
+ return [view documentCursor];
+ }
+ view = [view superview];
+ }
+ return QCursor();
}
void QWidget::unsetCursor()
diff --git a/WebCore/kwq/WebCoreFrameView.h b/WebCore/kwq/WebCoreFrameView.h
index 438b736..d6d122f 100644
--- a/WebCore/kwq/WebCoreFrameView.h
+++ b/WebCore/kwq/WebCoreFrameView.h
@@ -23,12 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
- at class NSCursor;
-
-// Among other things, this protocol is a way for an NSScrollView to detect
+// This protocol is a way for an NSScrollView to detect
// that the view it's embedded in is one that should be resized when the
// scroll view is resized.
@protocol WebCoreFrameView
-- (void)setCursor:(NSCursor *)cursor;
@end
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 4b0c19a..50762cd 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2002-11-11 Darin Adler <darin at apple.com>
+
+ - tighten up cursor handling a bit more
+
+ * WebView.subproj/WebDynamicScrollBarsView.m:
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView addMouseMovedObserver]): Call _frameOrBoundsChanged
+ so we emit a mouse moved event right away.
+ (-[WebHTMLView viewWillMoveToSuperview:]): Remove the colon since I
+ removed the parameter from _frameOrBoundsChanged.
+
+ * WebView.subproj/WebHTMLViewPrivate.h: Declare _frameOrBoundsChanged.
+ * WebView.subproj/WebHTMLViewPrivate.m:
+ (-[WebHTMLView _frameOrBoundsChanged]): Remove parameter.
+
2002-11-11 Trey Matteson <trey at apple.com>
Fixed 3015884 - Reloading a page should remember the scroll position
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 4b0c19a..50762cd 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,18 @@
+2002-11-11 Darin Adler <darin at apple.com>
+
+ - tighten up cursor handling a bit more
+
+ * WebView.subproj/WebDynamicScrollBarsView.m:
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView addMouseMovedObserver]): Call _frameOrBoundsChanged
+ so we emit a mouse moved event right away.
+ (-[WebHTMLView viewWillMoveToSuperview:]): Remove the colon since I
+ removed the parameter from _frameOrBoundsChanged.
+
+ * WebView.subproj/WebHTMLViewPrivate.h: Declare _frameOrBoundsChanged.
+ * WebView.subproj/WebHTMLViewPrivate.m:
+ (-[WebHTMLView _frameOrBoundsChanged]): Remove parameter.
+
2002-11-11 Trey Matteson <trey at apple.com>
Fixed 3015884 - Reloading a page should remember the scroll position
diff --git a/WebKit/WebView.subproj/WebDynamicScrollBarsView.m b/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
index 100683f..d0cfaa2 100644
--- a/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
+++ b/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
@@ -75,26 +75,6 @@
[super reflectScrolledClipView:clipView];
}
-- (void)setCursor:(NSCursor *)cur
-{
- if (!cur) {
- if (!cursor) {
- return;
- }
- } else {
- if ([cur isEqual:[NSCursor arrowCursor]]) {
- cur = nil;
- } else if (cursor && [cursor isEqual:cur]) {
- return;
- }
- }
-
- [cursor release];
- cursor = [cur retain];
-
- [self setDocumentCursor:cursor];
-}
-
- (void)setAllowsScrolling:(BOOL)flag
{
disallowsScrolling = !flag;
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index a52be41..df97f18 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -154,6 +154,7 @@
ASSERT(![self _insideAnotherHTMLView]);
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(mouseMovedNotification:)
name:NSMouseMovedNotification object:nil];
+ [self _frameOrBoundsChanged];
}
- (void)removeMouseMovedObserver
@@ -182,9 +183,9 @@
}
if (newSuperview) {
- [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_frameOrBoundsChanged:)
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_frameOrBoundsChanged)
name:NSViewFrameDidChangeNotification object:newSuperview];
- [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_frameOrBoundsChanged:)
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_frameOrBoundsChanged)
name:NSViewBoundsDidChangeNotification object:newSuperview];
}
}
@@ -222,7 +223,6 @@
_private->inWindow = NO;
}
}
- [super viewDidMoveToWindow];
}
- (void)addSubview:(NSView *)view
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.h b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
index 2d0a58c..d9e4663 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.h
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
@@ -56,4 +56,6 @@
+ (NSArray *)_pasteboardTypes;
- (void)_writeSelectionToPasteboard:(NSPasteboard *)pasteboard;
+- (void)_frameOrBoundsChanged;
+
@end
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index 2e5b8f1..f89a71d 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -125,7 +125,7 @@
userInfo:[NSDictionary dictionaryWithObject:fakeEvent forKey:@"NSEvent"]];
}
-- (void)_frameOrBoundsChanged:(NSNotification *)notification
+- (void)_frameOrBoundsChanged
{
if (!NSEqualSizes(_private->lastLayoutSize, [(NSClipView *)[self superview] documentVisibleRect].size)) {
[self setNeedsLayout:YES];
@@ -277,7 +277,7 @@
+ (NSArray *)_pasteboardTypes
{
return [NSArray arrayWithObjects:NSStringPboardType,
-#ifdef SUPPORT_HTML_PBOARD
+#if SUPPORT_HTML_PBOARD
NSHTMLPboardType,
#endif
NSRTFPboardType, nil];
@@ -300,7 +300,7 @@
attributedData = [attributedString RTFFromRange:NSMakeRange(0, [attributedString length]) documentAttributes:nil];
[pasteboard setData:attributedData forType:NSRTFPboardType];
-#ifdef SUPPORT_HTML_PBOARD
+#if SUPPORT_HTML_PBOARD
// Put HTML on the pasteboard.
#endif
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list