Changeset 11976 in webkit
- Timestamp:
- Jan 9, 2006 7:32:16 PM (18 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r11975 r11976 1 2006-01-09 Eric Seidel <eseidel@apple.com> 2 3 Reviewed by mjs. 4 5 Further code removal (and build fix!) 6 7 * khtml/Frame.cpp: 8 (Frame::init): 9 (Frame::~Frame): 10 (Frame::restoreURL): 11 (Frame::didOpenURL): 12 (Frame::baseURL): 13 (Frame::baseTarget): 14 * khtml/Frame.h: 15 (Frame::khtmlMouseDoubleClickEvent): 16 (Frame::khtmlDrawContentsEvent): 17 * kwq/KWQLoader.mm: 18 (KWQServeRequest): 19 * kwq/KWQSlot.mm: 20 (KWQSlot::KWQSlot): 21 (KWQSlot::call): 22 1 23 2006-01-09 Eric Seidel <eseidel@apple.com> 2 24 -
trunk/WebCore/khtml/Frame.cpp
r11975 r11976 85 85 #include <qptrlist.h> 86 86 87 #include <CoreServices/CoreServices.h>88 89 87 using namespace DOM::EventNames; 90 88 using namespace khtml; … … 167 165 d->m_bPluginsEnabled = true; 168 166 169 connect( khtml::Cache::loader(), SIGNAL( requestStarted( khtml::DocLoader*, khtml::CachedObject* ) ),170 this, SLOT( slotLoaderRequestStarted( khtml::DocLoader*, khtml::CachedObject* ) ) );171 167 connect( khtml::Cache::loader(), SIGNAL( requestDone( khtml::DocLoader*, khtml::CachedObject *) ), 172 168 this, SLOT( slotLoaderRequestDone( khtml::DocLoader*, khtml::CachedObject *) ) ); … … 174 170 this, SLOT( slotLoaderRequestDone( khtml::DocLoader*, khtml::CachedObject *) ) ); 175 171 176 connect( &d->m_redirectionTimer, SIGNAL( timeout() ), 177 this, SLOT( slotRedirect() ) ); 178 172 connect(&d->m_redirectionTimer, SIGNAL(timeout()), this, SLOT(slotRedirect())); 179 173 connect(&d->m_lifeSupportTimer, SIGNAL(timeout()), this, SLOT(slotEndLifeSupport())); 180 174 } … … 187 181 closeURL(); 188 182 189 disconnect( khtml::Cache::loader(), SIGNAL( requestStarted( khtml::DocLoader*, khtml::CachedObject* ) ),190 this, SLOT( slotLoaderRequestStarted( khtml::DocLoader*, khtml::CachedObject* ) ) );191 183 disconnect( khtml::Cache::loader(), SIGNAL( requestDone( khtml::DocLoader*, khtml::CachedObject *) ), 192 184 this, SLOT( slotLoaderRequestDone( khtml::DocLoader*, khtml::CachedObject *) ) ); … … 196 188 clear(); 197 189 198 if ( d->m_view ) 199 { 190 if (d->m_view) { 200 191 d->m_view->hide(); 201 192 d->m_view->viewport()->hide(); … … 208 199 bool Frame::restoreURL( const KURL &url ) 209 200 { 210 kdDebug( 6050 ) << "Frame::restoreURL " << url.url() << endl;211 212 201 cancelRedirection(); 213 202 … … 241 230 bool Frame::didOpenURL(const KURL &url) 242 231 { 243 kdDebug( 6050 ) << "Frame(" << this << ")::openURL " << url.url() << endl;244 245 232 if (d->m_scheduledRedirection == locationChangeScheduledDuringLoad) { 246 233 // We're about to get a redirect that happened before the document was … … 256 243 Mac(this)->clearUndoRedoOperations(); 257 244 258 259 245 KParts::URLArgs args( d->m_extension->urlArgs() ); 260 246 261 262 247 if (!d->m_restored) 263 {264 kdDebug( 6050 ) << "closing old URL" << endl;265 248 closeURL(); 266 }267 268 249 269 250 if (d->m_restored) … … 315 296 // copy to m_workingURL after fixing m_url above 316 297 d->m_workingURL = m_url; 317 318 kdDebug( 6050 ) << "Frame::openURL now (before started) m_url = " << m_url.url() << endl;319 298 320 299 connect( d->m_job, SIGNAL( speed( KIO::Job*, unsigned long ) ), … … 501 480 bool Frame::scheduleScript(DOM::NodeImpl *n, const QString& script) 502 481 { 503 //kdDebug(6050) << "Frame::scheduleScript "<< script << endl;504 505 482 d->scheduledScript = script; 506 483 d->scheduledScriptNode = n; … … 513 490 if( d->scheduledScript.isEmpty() ) 514 491 return QVariant(); 515 516 //kdDebug(6050) << "executing delayed " << d->scheduledScript << endl;517 492 518 493 QVariant ret = executeScript( d->scheduledScriptNode.get(), d->scheduledScript ); … … 575 550 if ( d->m_doc ) 576 551 d->m_doc->docLoader()->setAutoloadImages( enable ); 577 578 552 } 579 553 … … 591 565 return; 592 566 d->m_bCleared = true; 593 594 567 d->m_bClearing = true; 595 596 597 568 d->m_mousePressNode = 0; 598 599 569 600 570 if ( d->m_doc ) … … 613 583 d->m_doc->deref(); 614 584 d->m_doc = 0; 615 616 585 d->m_decoder = 0; 617 586 … … 633 602 ConstFrameIt it = d->m_objects.begin(); 634 603 ConstFrameIt end = d->m_objects.end(); 635 for(; it != end; ++it ) 636 { 604 for(; it != end; ++it ) { 637 605 if ( (*it).m_frame ) 638 {639 606 (*it).m_frame->deref(); 640 }641 607 } 642 608 } … … 1035 1001 checkEmitLoadEvent(); // if we didn't do it before 1036 1002 1037 1038 1003 if ( d->m_scheduledRedirection != noRedirectionScheduled ) 1039 1004 { … … 1093 1058 } 1094 1059 1060 KURL Frame::baseURL() const 1061 { 1062 if (!d->m_doc) 1063 return KURL(); 1064 return d->m_doc->baseURL(); 1065 } 1066 1067 QString Frame::baseTarget() const 1068 { 1069 if (!d->m_doc) 1070 return QString(); 1071 return d->m_doc->baseTarget(); 1072 } 1073 1095 1074 KURL Frame::completeURL( const QString &url ) 1096 1075 { … … 1103 1082 void Frame::scheduleRedirection( double delay, const QString &url, bool doLockHistory) 1104 1083 { 1105 kdDebug(6050) << "Frame::scheduleRedirection delay=" << delay << " url=" << url << endl;1106 1084 if (delay < 0 || delay > INT_MAX / 1000) 1107 1085 return; -
trunk/WebCore/khtml/Frame.h
r11975 r11976 130 130 Frame(QWidget *parentWidget = 0, const char *widgetname = 0, QObject *parent = 0, const char *name = 0); 131 131 Frame(KHTMLView *view, QObject *parent = 0, const char *name = 0); 132 133 /** 134 * Destructor. 135 */ 132 136 133 virtual ~Frame(); 137 134 … … 782 779 virtual void customEvent( QCustomEvent *event ); 783 780 virtual void khtmlMousePressEvent( khtml::MousePressEvent *event ); 784 virtual void khtmlMouseDoubleClickEvent( khtml::MouseDoubleClickEvent * );781 virtual void khtmlMouseDoubleClickEvent(khtml::MouseDoubleClickEvent*) { } 785 782 virtual void khtmlMouseMoveEvent( khtml::MouseMoveEvent *event ); 786 783 virtual void khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event ); 787 virtual void khtmlDrawContentsEvent( khtml::DrawContentsEvent * );784 virtual void khtmlDrawContentsEvent(khtml::DrawContentsEvent*) { } 788 785 789 786 void selectClosestWordFromMouseEvent(QMouseEvent *mouse, DOM::NodeImpl *innerNode, int x, int y); … … 837 834 void slotParentCompleted(); 838 835 void slotChildURLRequest( const KURL &url, const KParts::URLArgs &args ); 839 840 void slotLoaderRequestStarted( khtml::DocLoader*, khtml::CachedObject* obj);841 836 void slotLoaderRequestDone( khtml::DocLoader*, khtml::CachedObject *obj ); 842 837 void checkCompleted(); -
trunk/WebCore/kwq/KWQLoader.mm
r11966 r11976 49 49 50 50 bool KWQServeRequest(Loader *loader, Request *request, TransferJob *job) 51 { 52 LOG(Loading, "Serving request for base %s, url %s", 53 request->m_docLoader->frame()->baseURL().url().latin1(), 54 request->object->url().qstring().latin1()); 55 51 { 56 52 return KWQServeRequest(loader, request->m_docLoader, job); 57 53 } -
trunk/WebCore/kwq/KWQSlot.mm
r11966 r11976 69 69 slotFinishedParsing, 70 70 slotLoaderRequestDone, 71 slotLoaderRequestStarted,72 71 slotParentCompleted, 73 72 slotParentDestroyed, … … 110 109 CASE(slotFinishedParsing, (), Frame) 111 110 CASE(slotLoaderRequestDone, (khtml::DocLoader *, khtml::CachedObject *), Frame) 112 CASE(slotLoaderRequestStarted, (khtml::DocLoader *, khtml::CachedObject *), Frame)113 111 CASE(slotParentCompleted, (), Frame) 114 112 CASE(slotPerformSearch, (), RenderLineEdit) … … 351 349 static_cast<Frame *>(m_object.pointer())->slotLoaderRequestDone(loader, cachedObject); 352 350 return; 353 case slotLoaderRequestStarted:354 static_cast<Frame *>(m_object.pointer())->slotLoaderRequestStarted(loader, cachedObject);355 return;356 351 } 357 352
Note: See TracChangeset
for help on using the changeset viewer.