[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
mjs
mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:56:35 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 9d9070be34718d6c135108416d4e6a68ea0fe203
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 19 20:46:17 2003 +0000
WebCore:
Reviewed by Darin.
- fixed 3410980 - FileMaker: going forward with an empty forward list makes a frame come out blank sometimes
* khtml/html/html_documentimpl.cpp:
(HTMLDocumentImpl::close): Remove redundant check removed.
* khtml/khtml_part.h:
* kwq/KWQKHTMLPart.h:
* kwq/KWQKHTMLPart.mm:
(KWQKHTMLPart::scheduleHistoryNavigation): Only call the base class
method to actually schedule when it's possible to go back or forward
that number of steps.
* kwq/WebCoreBridge.h:
WebKit:
Reviewed by Darin.
- fixed 3410980 - FileMaker: going forward with an empty forward list makes a frame come out blank sometimes
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge backOrForwardItemWithDistance:]): Factored out from goBackOrForward.
(-[WebBridge canGoBackOrForward:]): Use the new method.
(-[WebBridge goBackOrForward:]): Likewise.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5006 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 0dbdddf..97314b8 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,19 @@
+2003-09-19 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Darin.
+
+ - fixed 3410980 - FileMaker: going forward with an empty forward list makes a frame come out blank sometimes
+
+ * khtml/html/html_documentimpl.cpp:
+ (HTMLDocumentImpl::close): Remove redundant check removed.
+ * khtml/khtml_part.h:
+ * kwq/KWQKHTMLPart.h:
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::scheduleHistoryNavigation): Only call the base class
+ method to actually schedule when it's possible to go back or forward
+ that number of steps.
+ * kwq/WebCoreBridge.h:
+
2003-09-17 John Sullivan <sullivan at apple.com>
- WebCore part of fix for 3157018 -- Would like option to
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 0dbdddf..97314b8 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,19 @@
+2003-09-19 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Darin.
+
+ - fixed 3410980 - FileMaker: going forward with an empty forward list makes a frame come out blank sometimes
+
+ * khtml/html/html_documentimpl.cpp:
+ (HTMLDocumentImpl::close): Remove redundant check removed.
+ * khtml/khtml_part.h:
+ * kwq/KWQKHTMLPart.h:
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::scheduleHistoryNavigation): Only call the base class
+ method to actually schedule when it's possible to go back or forward
+ that number of steps.
+ * kwq/WebCoreBridge.h:
+
2003-09-17 John Sullivan <sullivan at apple.com>
- WebCore part of fix for 3157018 -- Would like option to
diff --git a/WebCore/khtml/html/html_documentimpl.cpp b/WebCore/khtml/html/html_documentimpl.cpp
index 4886f7e..25cccf7 100644
--- a/WebCore/khtml/html/html_documentimpl.cpp
+++ b/WebCore/khtml/html/html_documentimpl.cpp
@@ -306,7 +306,7 @@ void HTMLDocumentImpl::close()
// First fire the onload.
bool doload = !parsing() && m_tokenizer && !processingLoadEvent;
- bool wasNotRedirecting = !view() || view()->part()->d->m_scheduledRedirection == noRedirectionScheduled;
+ bool wasNotRedirecting = !view();
processingLoadEvent = true;
if (body() && doload) {
@@ -323,7 +323,6 @@ void HTMLDocumentImpl::close()
// fires. This will improve onload scores, and other browsers do it.
// If they wanna cheat, we can too. -dwh
if (doload && wasNotRedirecting && view()
- && view()->part()->d->m_scheduledRedirection != noRedirectionScheduled
&& view()->part()->d->m_delayRedirect == 0
&& m_startTime.elapsed() < 1000) {
static int redirectCount = 0;
diff --git a/WebCore/khtml/khtml_part.h b/WebCore/khtml/khtml_part.h
index 363b62d..643770f 100644
--- a/WebCore/khtml/khtml_part.h
+++ b/WebCore/khtml/khtml_part.h
@@ -376,7 +376,7 @@ public:
* Schedules a history navigation operation (go forward, go back, etc.).
* This is used for JavaScript-triggered location changes.
*/
- void scheduleHistoryNavigation( int steps );
+ virtual void scheduleHistoryNavigation( int steps );
/**
* Clears the widget and prepares it for new content.
diff --git a/WebCore/kwq/KWQKHTMLPart.h b/WebCore/kwq/KWQKHTMLPart.h
index b4fe63c..9937076 100644
--- a/WebCore/kwq/KWQKHTMLPart.h
+++ b/WebCore/kwq/KWQKHTMLPart.h
@@ -97,6 +97,8 @@ public:
void openURLRequest(const KURL &, const KParts::URLArgs &);
void submitForm(const KURL &, const KParts::URLArgs &);
+
+ void scheduleHistoryNavigation( int steps );
void scrollToAnchor(const KURL &);
void jumpToSelection();
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index f382d3f..3286f71 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -578,6 +578,13 @@ void KWQKHTMLPart::submitForm(const KURL &url, const URLArgs &args)
clearRecordedFormValues();
}
+void KWQKHTMLPart::scheduleHistoryNavigation( int steps )
+{
+ if ([_bridge canGoBackOrForward:steps]) {
+ KHTMLPart::scheduleHistoryNavigation(steps);
+ }
+}
+
void KWQKHTMLPart::setEncoding(const QString &name, bool userChosen)
{
if (!d->m_workingURL.isEmpty()) {
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index 9ec8176..3ba4989 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -325,6 +325,7 @@ typedef enum {
- (int)historyLength;
- (void)goBackOrForward:(int)distance;
+- (BOOL)canGoBackOrForward:(int)distance;
- (void)controlTextDidBeginEditing:(NSNotification *)obj;
- (void)controlTextDidEndEditing:(NSNotification *)obj;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 91bc983..2ee197c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-09-19 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Darin.
+
+ - fixed 3410980 - FileMaker: going forward with an empty forward list makes a frame come out blank sometimes
+
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge backOrForwardItemWithDistance:]): Factored out from goBackOrForward.
+ (-[WebBridge canGoBackOrForward:]): Use the new method.
+ (-[WebBridge goBackOrForward:]): Likewise.
+
2003-09-17 John Sullivan <sullivan at apple.com>
- WebKit part of fix for 3157018 -- Would like option to
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 8568c57..163a3bc 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -838,10 +838,10 @@ static BOOL loggedObjectCacheSize = NO;
return [[[_frame webView] backForwardList] backListCount];
}
-- (void)goBackOrForward:(int)distance
+- (WebHistoryItem *)backOrForwardItemWithDistance:(int)distance
{
if (distance == 0) {
- return;
+ return nil;
}
WebView *webView = [_frame webView];
WebBackForwardList *list = [webView backForwardList];
@@ -859,8 +859,20 @@ static BOOL loggedObjectCacheSize = NO;
}
}
}
- if (item) {
- [webView goToBackForwardItem:item];
+
+ return item;
+}
+
+- (BOOL)canGoBackOrForward:(int)distance
+{
+ return [self backOrForwardItemWithDistance:distance] != nil;
+}
+
+- (void)goBackOrForward:(int)distance
+{
+ WebHistoryItem *item = [self backOrForwardItemWithDistance:distance];
+ if (item != nil) {
+ [[_frame webView] goToBackForwardItem:item];
}
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list