<rdar://problem/
3807144> REGRESSION (125-TOT): my bank's website doesn't work (Societe Generale, socgen.com)
* Khtml/khtml_part.cpp:
(KHTMLPart::checkCompleted): If the document is NULL, assume this frame has
not started loading yet so it could not possibly be finishing here...
(KHTMLPart::stop): ...unless the part is explicitly stopped and there is still
no document, in this case we must have hit an error or been loading a non-HTML
frame.
* khtml/khtml_part.h:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8323
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2005-01-07 Maciej Stachowiak <mjs@apple.com>
+
+ Reviewed by Darin.
+
+ <rdar://problem/3807144> REGRESSION (125-TOT): my bank's website doesn't work (Societe Generale, socgen.com)
+
+ * Khtml/khtml_part.cpp:
+ (KHTMLPart::checkCompleted): If the document is NULL, assume this frame has
+ not started loading yet so it could not possibly be finishing here...
+ (KHTMLPart::stop): ...unless the part is explicitly stopped and there is still
+ no document, in this case we must have hit an error or been loading a non-HTML
+ frame.
+ * khtml/khtml_part.h:
+
2005-01-08 David Harrison <harrison@apple.com>
Reviewed by Maciej.
// WebCore is enough involved that we need to checkCompleted() in order for m_bComplete to
// become true. An example is when a subframe is a pure text doc, and that subframe is the
// last one to complete.
- checkCompleted();
+ checkCompleted(true);
}
#if !APPLE_CHANGES
#endif
-void KHTMLPart::checkCompleted()
+void KHTMLPart::checkCompleted(bool ignoreDoc)
{
// kdDebug( 6050 ) << "KHTMLPart::checkCompleted() parsing: " << d->m_doc->parsing() << endl;
// kdDebug( 6050 ) << " complete: " << d->m_bComplete << endl;
if ( !(*it).m_bCompleted )
return;
- // Are we still parsing - or have we done the completed stuff already ?
- if ( d->m_bComplete || (d->m_doc && d->m_doc->parsing()) )
+ // Have we completed before?
+ if ( d->m_bComplete )
+ return;
+
+ // Are we still parsing?
+ if ( d->m_doc && d->m_doc->parsing() )
+ return;
+
+ // Have we not even started getting data for the main resource yet?
+ if ( !d->m_doc && !ignoreDoc)
return;
// Still waiting for images/scripts from the loader ?
void slotLoaderRequestStarted( khtml::DocLoader*, khtml::CachedObject* obj);
void slotLoaderRequestDone( khtml::DocLoader*, khtml::CachedObject *obj );
- void checkCompleted();
+ void checkCompleted(bool ignoreDoc = false);
/**
* @internal
if ([string isKindOfClass:[NSAttributedString class]]) {
ERROR("TEXTINPUT: requested insert of attributed string");
text = [string string];
+ int length = [text length];
+ int i = 0;
+ while (i < length) {
+ NSRange effectiveRange;
+ NSDictionary *attrs = [string attributesAtIndex:i longestEffectiveRange:&effectiveRange inRange:NSMakeRange(i,length - i)];
+ i = effectiveRange.location + effectiveRange.length;
+ NSLog(@"attribute chunk: %@ from %d length %d\n", attrs, effectiveRange.location, effectiveRange.length);
+ }
} else {
text = string;
}