[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 07:40:10 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 51e8fa5bc769dad3ff361d46fcf91ca1d46c779b
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri May 2 18:13:19 2003 +0000
WebCore:
Reviewed by John.
- fixed 3236383 -- http://www.xy.com/ exception, crash loading main page
* kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::scheduleClose): Change to use closeWindowSoon, so that
the delay is on the WebKit side so it can be tied to the WebView as a whole, not a particular bridge.
* kwq/WebCoreBridge.h: Replaced closeWindow with closeWindowSoon.
- rolled in a couple of harmless and eventually-possibly-useful changes inspired by changes
OmniGroup made in their copy of WebCore
* kwq/KWQListBox.mm: Make KWQTableView a KWQWidgetHolder.
(-[KWQTableView widget]): Return the widget.
* kwq/KWQScrollView.mm: (QScrollView::ensureVisible): First cut at implementing these.
WebKit:
Reviewed by John.
- fixed 3236383 -- http://www.xy.com/ exception, crash loading main page
* WebCoreSupport.subproj/WebBridge.m: (-[WebBridge closeWindowSoon]): Replaces
closeWindow. Schedule a closeWindow operation in the WebView. Important to not have
the call's execution depend on whether this WebBridge or WebFrame is still around
after the delay.
* WebView.subproj/WebViewPrivate.h: Added _closeWindow.
* WebView.subproj/WebViewPrivate.m: (-[WebView _closeWindow]): Make a webViewClose:
call on the UI delegate.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4264 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 0c01c06..0989ae8 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,21 @@
+2003-05-02 Darin Adler <darin at apple.com>
+
+ Reviewed by John.
+
+ - fixed 3236383 -- http://www.xy.com/ exception, crash loading main page
+
+ * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::scheduleClose): Change to use closeWindowSoon, so that
+ the delay is on the WebKit side so it can be tied to the WebView as a whole, not a particular bridge.
+
+ * kwq/WebCoreBridge.h: Replaced closeWindow with closeWindowSoon.
+
+ - rolled in a couple of harmless and eventually-possibly-useful changes inspired by changes
+ OmniGroup made in their copy of WebCore
+
+ * kwq/KWQListBox.mm: Make KWQTableView a KWQWidgetHolder.
+ (-[KWQTableView widget]): Return the widget.
+ * kwq/KWQScrollView.mm: (QScrollView::ensureVisible): First cut at implementing these.
+
2003-05-02 David Hyatt <hyatt at apple.com>
Make sure that recalcSections always clears out the needSectionRecalc
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 0c01c06..0989ae8 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,21 @@
+2003-05-02 Darin Adler <darin at apple.com>
+
+ Reviewed by John.
+
+ - fixed 3236383 -- http://www.xy.com/ exception, crash loading main page
+
+ * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::scheduleClose): Change to use closeWindowSoon, so that
+ the delay is on the WebKit side so it can be tied to the WebView as a whole, not a particular bridge.
+
+ * kwq/WebCoreBridge.h: Replaced closeWindow with closeWindowSoon.
+
+ - rolled in a couple of harmless and eventually-possibly-useful changes inspired by changes
+ OmniGroup made in their copy of WebCore
+
+ * kwq/KWQListBox.mm: Make KWQTableView a KWQWidgetHolder.
+ (-[KWQTableView widget]): Return the widget.
+ * kwq/KWQScrollView.mm: (QScrollView::ensureVisible): First cut at implementing these.
+
2003-05-02 David Hyatt <hyatt at apple.com>
Make sure that recalcSections always clears out the needSectionRecalc
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 64845a3..22526fa 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -657,7 +657,7 @@ void KWQKHTMLPart::setStatusBarText(const QString &status)
void KWQKHTMLPart::scheduleClose()
{
- [_bridge performSelector:@selector(closeWindow) withObject:nil afterDelay:0.0];
+ [_bridge closeWindowSoon];
}
void KWQKHTMLPart::unfocusWindow()
diff --git a/WebCore/kwq/KWQListBox.mm b/WebCore/kwq/KWQListBox.mm
index c33a8cd..5d05c92 100644
--- a/WebCore/kwq/KWQListBox.mm
+++ b/WebCore/kwq/KWQListBox.mm
@@ -26,6 +26,7 @@
#import "KWQListBox.h"
#import "KWQAssertions.h"
+#import "KWQView.h"
#import "WebCoreScrollView.h"
#define MIN_LINES 4 /* ensures we have a scroll bar */
@@ -35,7 +36,7 @@
}
@end
- at interface KWQTableView : NSTableView
+ at interface KWQTableView : NSTableView <KWQWidgetHolder>
{
QListBox *_box;
NSArray *_items;
@@ -309,4 +310,9 @@ QSize QListBox::sizeForNumberOfLines(int lines) const
[(NSCell *)cell setEnabled:_box->isEnabled()];
}
+- (QWidget *)widget
+{
+ return _box;
+}
+
@end
diff --git a/WebCore/kwq/KWQScrollView.mm b/WebCore/kwq/KWQScrollView.mm
index 315dde0..ef8c60f 100644
--- a/WebCore/kwq/KWQScrollView.mm
+++ b/WebCore/kwq/KWQScrollView.mm
@@ -289,14 +289,14 @@ void QScrollView::resizeEvent(QResizeEvent *)
{
}
-void QScrollView::ensureVisible(int,int)
+void QScrollView::ensureVisible(int x, int y)
{
- ERROR("not yet implemented");
+ [getDocumentView() scrollRectToVisible:NSMakeRect(x, y, 0, 0)];
}
-void QScrollView::ensureVisible(int,int,int,int)
+void QScrollView::ensureVisible(int x, int y, int w, int h)
{
- LOG(NotYetImplemented, "not yet implemented");
+ [getDocumentView() scrollRectToVisible:NSMakeRect(x, y, w, h)];
}
NSView *QScrollView::getDocumentView() const
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index 7906a4e..b235615 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -260,7 +260,7 @@ enum FrameBorderStyle {
- (NSResponder *)firstResponder;
- (void)makeFirstResponder:(NSResponder *)view;
-- (void)closeWindow;
+- (void)closeWindowSoon;
- (void)runJavaScriptAlertPanelWithMessage:(NSString *)message;
- (BOOL)runJavaScriptConfirmPanelWithMessage:(NSString *)message;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index fcd15e1..987e3fc 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -2,6 +2,21 @@
Reviewed by John.
+ - fixed 3236383 -- http://www.xy.com/ exception, crash loading main page
+
+ * WebCoreSupport.subproj/WebBridge.m: (-[WebBridge closeWindowSoon]): Replaces
+ closeWindow. Schedule a closeWindow operation in the WebView. Important to not have
+ the call's execution depend on whether this WebBridge or WebFrame is still around
+ after the delay.
+
+ * WebView.subproj/WebViewPrivate.h: Added _closeWindow.
+ * WebView.subproj/WebViewPrivate.m: (-[WebView _closeWindow]): Make a webViewClose:
+ call on the UI delegate.
+
+2003-05-02 Darin Adler <darin at apple.com>
+
+ Reviewed by John.
+
- first step in fixing 3236383 -- http://www.xy.com/ exception, crash loading main page
Changed WebFrame to explicitly detach from the bridge so we don't have a stale pointer;
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index d9d1f21..e4a7721 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -245,11 +245,9 @@
[[webView _UIDelegateForwarder] webView:webView makeFirstResponder:view];
}
-- (void)closeWindow
+- (void)closeWindowSoon
{
- ASSERT(_frame != nil);
- WebView *webView = [_frame webView];
- [[webView _UIDelegateForwarder] webViewClose:webView];
+ [[_frame webView] performSelector:@selector(_closeWindow) withObject:nil afterDelay:0.0];
}
- (NSWindow *)window
diff --git a/WebKit/WebView.subproj/WebViewPrivate.h b/WebKit/WebView.subproj/WebViewPrivate.h
index c12f300..3f91ccb 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.h
+++ b/WebKit/WebView.subproj/WebViewPrivate.h
@@ -160,6 +160,8 @@ Could be worth adding to the API.
- _policyDelegateForwarder;
- _UIDelegateForwarder;
+- (void)_closeWindow;
+
- (void)_registerDraggedTypes;
- (void)_close;
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index d5f2362..7185a41 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -558,6 +558,11 @@
[self registerForDraggedTypes:[NSPasteboard _web_dragTypesForURL]];
}
+- (void)_closeWindow
+{
+ [[self _UIDelegateForwarder] webViewClose:self];
+}
+
@end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list