[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 06:29:07 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 5db2e2b2c2bdcc4a3dd39b85b7eb70131fe1b4fd
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Aug 5 11:08:52 2002 +0000
WebCore:
Merged KHTMLPart::end method with khtml original.
* khtml/khtml_part.cpp:
(KHTMLPart::end): Remove call to impl. Use original version, but
clear KURL cache and call slotFinishedParsing as well.
* kwq/KWQKHTMLPartImpl.h:
* kwq/KWQKHTMLPartImpl.mm:
(KWQKHTMLPartImpl::end): Removed.
(KWQKHTMLPartImpl::gotoBaseAnchor): Removed. No longer needed.
* kwq/KWQKURL.mm:
(KURL::encodedHtmlRef): Implemented.
(KURL::htmlRef): Implemented.
* kwq/WebCoreBridge.h:
* kwq/WebCoreBridge.mm:
(-[WebCoreBridge scrollToBaseAnchor]): Removed. No longer needed.
WebKit:
Some changes related to re-merging the KHTMLPart end() method:
* Misc.subproj/WebKitDebug.h: Added WEBKIT_ASSERT_NOT_REACHED().
* WebView.subproj/WebFramePrivate.m:
(-[WebFrame _transitionToLayoutAcceptable]): Replace NSException with
ASSERT_NOT_REACHED (this is an internal consistency check, not an
argument check on a public API, so an assert is more appropriate than
an exception).
(-[WebFrame _transitionToCommitted]): Likewise.
(-[WebFrame _isLoadComplete]): Likewise; also, remove bridge call
to scrollToBaseAnchor:, since that will now happen automatically
when calling end.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1732 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index a85102d..c61b397 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,23 @@
2002-08-05 Maciej Stachowiak <mjs at apple.com>
+ Merged KHTMLPart::end method with khtml original.
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::end): Remove call to impl. Use original version, but
+ clear KURL cache and call slotFinishedParsing as well.
+ * kwq/KWQKHTMLPartImpl.h:
+ * kwq/KWQKHTMLPartImpl.mm:
+ (KWQKHTMLPartImpl::end): Removed.
+ (KWQKHTMLPartImpl::gotoBaseAnchor): Removed. No longer needed.
+ * kwq/KWQKURL.mm:
+ (KURL::encodedHtmlRef): Implemented.
+ (KURL::htmlRef): Implemented.
+ * kwq/WebCoreBridge.h:
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge scrollToBaseAnchor]): Removed. No longer needed.
+
+2002-08-05 Maciej Stachowiak <mjs at apple.com>
+
Merged KHTMLPart::openURL method with khtml original.
* khtml/khtml_part.cpp:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a85102d..c61b397 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,23 @@
2002-08-05 Maciej Stachowiak <mjs at apple.com>
+ Merged KHTMLPart::end method with khtml original.
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::end): Remove call to impl. Use original version, but
+ clear KURL cache and call slotFinishedParsing as well.
+ * kwq/KWQKHTMLPartImpl.h:
+ * kwq/KWQKHTMLPartImpl.mm:
+ (KWQKHTMLPartImpl::end): Removed.
+ (KWQKHTMLPartImpl::gotoBaseAnchor): Removed. No longer needed.
+ * kwq/KWQKURL.mm:
+ (KURL::encodedHtmlRef): Implemented.
+ (KURL::htmlRef): Implemented.
+ * kwq/WebCoreBridge.h:
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge scrollToBaseAnchor]): Removed. No longer needed.
+
+2002-08-05 Maciej Stachowiak <mjs at apple.com>
+
Merged KHTMLPart::openURL method with khtml original.
* khtml/khtml_part.cpp:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a85102d..c61b397 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,23 @@
2002-08-05 Maciej Stachowiak <mjs at apple.com>
+ Merged KHTMLPart::end method with khtml original.
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::end): Remove call to impl. Use original version, but
+ clear KURL cache and call slotFinishedParsing as well.
+ * kwq/KWQKHTMLPartImpl.h:
+ * kwq/KWQKHTMLPartImpl.mm:
+ (KWQKHTMLPartImpl::end): Removed.
+ (KWQKHTMLPartImpl::gotoBaseAnchor): Removed. No longer needed.
+ * kwq/KWQKURL.mm:
+ (KURL::encodedHtmlRef): Implemented.
+ (KURL::htmlRef): Implemented.
+ * kwq/WebCoreBridge.h:
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge scrollToBaseAnchor]): Removed. No longer needed.
+
+2002-08-05 Maciej Stachowiak <mjs at apple.com>
+
Merged KHTMLPart::openURL method with khtml original.
* khtml/khtml_part.cpp:
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index df96580..673b65c 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -1449,14 +1449,17 @@ void KHTMLPart::write( const QString &str )
void KHTMLPart::end()
{
-#ifdef APPLE_CHANGES
- impl->end();
-#else
// make sure nothing's left in there...
if(d->m_decoder)
write(d->m_decoder->flush());
if (d->m_doc)
d->m_doc->finishParsing();
+#ifdef APPLE_CHANGES
+ KURL::clearCaches();
+
+ // FIXME: Would be better if we could just count on the signal
+ // instead of doing this.
+ slotFinishedParsing();
#endif
}
diff --git a/WebCore/kwq/KWQKHTMLPart.h b/WebCore/kwq/KWQKHTMLPart.h
index 471303f..f7139d7 100644
--- a/WebCore/kwq/KWQKHTMLPart.h
+++ b/WebCore/kwq/KWQKHTMLPart.h
@@ -67,12 +67,9 @@ public:
KHTMLView *getView() const;
bool openURLInFrame(const KURL &, const KParts::URLArgs &);
- void end();
void slotData(NSString *, const char *bytes, int length, bool complete = false);
- bool gotoBaseAnchor();
-
void setTitle(const DOM::DOMString &);
void setStatusBarText(const QString &status);
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index d3235e5..ae77858 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -125,27 +125,6 @@ void KWQKHTMLPartImpl::slotData(NSString *encoding, const char *bytes, int lengt
part->write(bytes, length);
}
-// FIXME: Need to remerge this with code in khtml_part.cpp?
-void KWQKHTMLPartImpl::end()
-{
- KWQ_ASSERT(d->m_doc != NULL);
-
- d->m_doc->setParsing(false);
-
- d->m_doc->close();
- KURL::clearCaches();
-
- if (d->m_view)
- d->m_view->complete();
-}
-
-bool KWQKHTMLPartImpl::gotoBaseAnchor()
-{
- if ( !part->m_url.ref().isEmpty() )
- return part->gotoAnchor( part->m_url.ref() );
- return false;
-}
-
void KWQKHTMLPartImpl::urlSelected( const QString &url, int button, int state, const QString &_target, KParts::URLArgs )
{
KURL clickedURL(part->completeURL( url));
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.h b/WebCore/kwq/KWQKHTMLPartImpl.h
index 471303f..f7139d7 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.h
+++ b/WebCore/kwq/KWQKHTMLPartImpl.h
@@ -67,12 +67,9 @@ public:
KHTMLView *getView() const;
bool openURLInFrame(const KURL &, const KParts::URLArgs &);
- void end();
void slotData(NSString *, const char *bytes, int length, bool complete = false);
- bool gotoBaseAnchor();
-
void setTitle(const DOM::DOMString &);
void setStatusBarText(const QString &status);
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index d3235e5..ae77858 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -125,27 +125,6 @@ void KWQKHTMLPartImpl::slotData(NSString *encoding, const char *bytes, int lengt
part->write(bytes, length);
}
-// FIXME: Need to remerge this with code in khtml_part.cpp?
-void KWQKHTMLPartImpl::end()
-{
- KWQ_ASSERT(d->m_doc != NULL);
-
- d->m_doc->setParsing(false);
-
- d->m_doc->close();
- KURL::clearCaches();
-
- if (d->m_view)
- d->m_view->complete();
-}
-
-bool KWQKHTMLPartImpl::gotoBaseAnchor()
-{
- if ( !part->m_url.ref().isEmpty() )
- return part->gotoAnchor( part->m_url.ref() );
- return false;
-}
-
void KWQKHTMLPartImpl::urlSelected( const QString &url, int button, int state, const QString &_target, KParts::URLArgs )
{
KURL clickedURL(part->completeURL( url));
diff --git a/WebCore/kwq/KWQKURL.mm b/WebCore/kwq/KWQKURL.mm
index ace9291..1a645cb 100644
--- a/WebCore/kwq/KWQKURL.mm
+++ b/WebCore/kwq/KWQKURL.mm
@@ -700,14 +700,12 @@ NSURL *KURL::getNSURL() const
QString KURL::encodedHtmlRef() const
{
- _logNotYetImplemented();
- return 0;
+ return ref();
}
QString KURL::htmlRef() const
{
- _logNotYetImplemented();
- return 0;
+ return decode_string(ref());
}
bool operator==(const KURL &a, const KURL &b)
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index f46ecc9..6b629f6 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -87,7 +87,6 @@ typedef khtml::RenderPart KHTMLRenderPart;
- (void)installInFrame:(NSView *)view;
- (void)removeFromFrame;
-- (void)scrollToBaseAnchor;
- (void)scrollToAnchor:(NSString *)anchor;
- (void)createKHTMLViewWithNSView:(NSView *)view
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index 5f50f2f..447b07c 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -127,11 +127,6 @@ using namespace khtml;
bridgeOwnsKHTMLView = YES;
}
-- (void)scrollToBaseAnchor
-{
- part->impl->gotoBaseAnchor();
-}
-
- (void)scrollToAnchor:(NSString *)a
{
part->gotoAnchor(QString::fromNSString(a));
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 2fe038d..c82cc89 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2002-08-05 Maciej Stachowiak <mjs at apple.com>
+
+ Some changes related to re-merging the KHTMLPart end() method:
+
+ * Misc.subproj/WebKitDebug.h: Added WEBKIT_ASSERT_NOT_REACHED().
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _transitionToLayoutAcceptable]): Replace NSException with
+ ASSERT_NOT_REACHED (this is an internal consistency check, not an
+ argument check on a public API, so an assert is more appropriate than
+ an exception).
+ (-[WebFrame _transitionToCommitted]): Likewise.
+ (-[WebFrame _isLoadComplete]): Likewise; also, remove bridge call
+ to scrollToBaseAnchor:, since that will now happen automatically
+ when calling end.
+
2002-08-02 Darin Adler <darin at apple.com>
WebKit support for feature where client redirects are treated as if the
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 2fe038d..c82cc89 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,18 @@
+2002-08-05 Maciej Stachowiak <mjs at apple.com>
+
+ Some changes related to re-merging the KHTMLPart end() method:
+
+ * Misc.subproj/WebKitDebug.h: Added WEBKIT_ASSERT_NOT_REACHED().
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _transitionToLayoutAcceptable]): Replace NSException with
+ ASSERT_NOT_REACHED (this is an internal consistency check, not an
+ argument check on a public API, so an assert is more appropriate than
+ an exception).
+ (-[WebFrame _transitionToCommitted]): Likewise.
+ (-[WebFrame _isLoadComplete]): Likewise; also, remove bridge call
+ to scrollToBaseAnchor:, since that will now happen automatically
+ when calling end.
+
2002-08-02 Darin Adler <darin at apple.com>
WebKit support for feature where client redirects are treated as if the
diff --git a/WebKit/Misc.subproj/WebKitDebug.h b/WebKit/Misc.subproj/WebKitDebug.h
index 6b025cc..3d88566 100644
--- a/WebKit/Misc.subproj/WebKitDebug.h
+++ b/WebKit/Misc.subproj/WebKitDebug.h
@@ -11,6 +11,7 @@
#define WEBKIT_ASSERT(expr) ((void)0)
#define WEBKIT_ASSERT_VALID_ARG(arg, expr) ((void)0)
#define WEBKIT_ASSERT_NOT_NIL(arg) ((void)0)
+#define WEBKIT_ASSERT_NOT_REACHED() ((void)0)
#else
@@ -117,6 +118,9 @@ void WebKitLog(unsigned int level, const char *file, int line, const char *funct
#define WEBKITDEBUG(format...) WEBKITDEBUGLEVEL(WEBKIT_LOG_GENERIC_DEBUG, format)
+#define WEBKIT_ASSERT_NOT_REACHED() \
+ WEBKIT_ASSERTION_FAILURE("reached unreachable code")
+
#ifdef WEB_MALLOC_TESTING
#ifdef __cplusplus
extern "C" {
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 22eff5e..b8cb2a0 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -227,8 +227,7 @@ static const char * const stateNames[6] = {
case WebFrameStateUninitialized:
default:
{
- [[NSException exceptionWithName:NSGenericException reason: [NSString stringWithFormat: @"invalid state attempting to transition to WebFrameStateLayoutAcceptable from %s", stateNames[_private->state]] userInfo: nil] raise];
- return;
+ WEBKIT_ASSERT_NOT_REACHED();
}
}
}
@@ -292,11 +291,8 @@ static const char * const stateNames[6] = {
// FIXME Remove this check when dummy ds is removed. An exception should be thrown
// if we're in the WebFrameLoadTypeUninitialized state.
case WebFrameLoadTypeUninitialized:
- break;
-
default:
- [[NSException exceptionWithName:NSGenericException reason:@"invalid load type during commit transition" userInfo: nil] raise];
- break;
+ WEBKIT_ASSERT_NOT_REACHED();
}
}
@@ -315,8 +311,7 @@ static const char * const stateNames[6] = {
case WebFrameStateComplete:
default:
{
- [[NSException exceptionWithName:NSGenericException reason:[NSString stringWithFormat: @"invalid state attempting to transition to WebFrameStateCommittedPage from %s", stateNames[_private->state]] userInfo: nil] raise];
- return;
+ WEBKIT_ASSERT_NOT_REACHED();
}
}
}
@@ -363,8 +358,7 @@ static const char * const stateNames[6] = {
// Shouldn't ever be in this state.
case WebFrameStateUninitialized:
{
- [[NSException exceptionWithName:NSGenericException reason:@"invalid state WebFrameStateUninitialized during completion check with error" userInfo: nil] raise];
- return;
+ WEBKIT_ASSERT_NOT_REACHED();
}
case WebFrameStateProvisional:
@@ -441,9 +435,6 @@ static const char * const stateNames[6] = {
[thisDocumentView setNeedsDisplay: YES];
//[thisDocumentView display];
- // Jump to anchor point, if necessary.
- [[ds _bridge] scrollToBaseAnchor];
-
// If the user had a scroll point scroll to it. This will override
// the anchor point. After much discussion it was decided by folks
// that the user scroll point should override the anchor point.
@@ -511,8 +502,7 @@ static const char * const stateNames[6] = {
// Yikes! Serious horkage.
default:
{
- [[NSException exceptionWithName:NSGenericException reason:@"invalid state during completion check with error" userInfo: nil] raise];
- break;
+ WEBKIT_ASSERT_NOT_REACHED();
}
}
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list