Changeset 11976 in webkit


Ignore:
Timestamp:
Jan 9, 2006 7:32:16 PM (18 years ago)
Author:
eseidel
Message:

2006-01-09 Eric Seidel <eseidel@apple.com>

Reviewed by mjs.

Further code removal (and build fix!)

  • khtml/Frame.cpp: (Frame::init): (Frame::~Frame): (Frame::restoreURL): (Frame::didOpenURL): (Frame::baseURL): (Frame::baseTarget):
  • khtml/Frame.h: (Frame::khtmlMouseDoubleClickEvent): (Frame::khtmlDrawContentsEvent):
  • kwq/KWQLoader.mm: (KWQServeRequest):
  • kwq/KWQSlot.mm: (KWQSlot::KWQSlot): (KWQSlot::call):
Location:
trunk/WebCore
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r11975 r11976  
     12006-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
    1232006-01-09  Eric Seidel  <eseidel@apple.com>
    224
  • trunk/WebCore/khtml/Frame.cpp

    r11975 r11976  
    8585#include <qptrlist.h>
    8686
    87 #include <CoreServices/CoreServices.h>
    88 
    8987using namespace DOM::EventNames;
    9088using namespace khtml;
     
    167165  d->m_bPluginsEnabled = true;
    168166
    169   connect( khtml::Cache::loader(), SIGNAL( requestStarted( khtml::DocLoader*, khtml::CachedObject* ) ),
    170            this, SLOT( slotLoaderRequestStarted( khtml::DocLoader*, khtml::CachedObject* ) ) );
    171167  connect( khtml::Cache::loader(), SIGNAL( requestDone( khtml::DocLoader*, khtml::CachedObject *) ),
    172168           this, SLOT( slotLoaderRequestDone( khtml::DocLoader*, khtml::CachedObject *) ) );
     
    174170           this, SLOT( slotLoaderRequestDone( khtml::DocLoader*, khtml::CachedObject *) ) );
    175171
    176   connect( &d->m_redirectionTimer, SIGNAL( timeout() ),
    177            this, SLOT( slotRedirect() ) );
    178 
     172  connect(&d->m_redirectionTimer, SIGNAL(timeout()), this, SLOT(slotRedirect()));
    179173  connect(&d->m_lifeSupportTimer, SIGNAL(timeout()), this, SLOT(slotEndLifeSupport()));
    180174}
     
    187181    closeURL();
    188182
    189   disconnect( khtml::Cache::loader(), SIGNAL( requestStarted( khtml::DocLoader*, khtml::CachedObject* ) ),
    190            this, SLOT( slotLoaderRequestStarted( khtml::DocLoader*, khtml::CachedObject* ) ) );
    191183  disconnect( khtml::Cache::loader(), SIGNAL( requestDone( khtml::DocLoader*, khtml::CachedObject *) ),
    192184           this, SLOT( slotLoaderRequestDone( khtml::DocLoader*, khtml::CachedObject *) ) );
     
    196188  clear();
    197189
    198   if ( d->m_view )
    199   {
     190  if (d->m_view) {
    200191    d->m_view->hide();
    201192    d->m_view->viewport()->hide();
     
    208199bool Frame::restoreURL( const KURL &url )
    209200{
    210   kdDebug( 6050 ) << "Frame::restoreURL " << url.url() << endl;
    211 
    212201  cancelRedirection();
    213202
     
    241230bool Frame::didOpenURL(const KURL &url)
    242231{
    243   kdDebug( 6050 ) << "Frame(" << this << ")::openURL " << url.url() << endl;
    244 
    245232  if (d->m_scheduledRedirection == locationChangeScheduledDuringLoad) {
    246233    // We're about to get a redirect that happened before the document was
     
    256243  Mac(this)->clearUndoRedoOperations();
    257244 
    258 
    259245  KParts::URLArgs args( d->m_extension->urlArgs() );
    260246
    261 
    262247  if (!d->m_restored)
    263   {
    264     kdDebug( 6050 ) << "closing old URL" << endl;
    265248    closeURL();
    266   }
    267 
    268249
    269250  if (d->m_restored)
     
    315296  // copy to m_workingURL after fixing m_url above
    316297  d->m_workingURL = m_url;
    317 
    318   kdDebug( 6050 ) << "Frame::openURL now (before started) m_url = " << m_url.url() << endl;
    319298
    320299  connect( d->m_job, SIGNAL( speed( KIO::Job*, unsigned long ) ),
     
    501480bool Frame::scheduleScript(DOM::NodeImpl *n, const QString& script)
    502481{
    503     //kdDebug(6050) << "Frame::scheduleScript "<< script << endl;
    504 
    505482    d->scheduledScript = script;
    506483    d->scheduledScriptNode = n;
     
    513490  if( d->scheduledScript.isEmpty() )
    514491    return QVariant();
    515 
    516   //kdDebug(6050) << "executing delayed " << d->scheduledScript << endl;
    517492
    518493  QVariant ret = executeScript( d->scheduledScriptNode.get(), d->scheduledScript );
     
    575550  if ( d->m_doc )
    576551    d->m_doc->docLoader()->setAutoloadImages( enable );
    577 
    578552}
    579553
     
    591565    return;
    592566  d->m_bCleared = true;
    593 
    594567  d->m_bClearing = true;
    595 
    596 
    597568  d->m_mousePressNode = 0;
    598 
    599569
    600570  if ( d->m_doc )
     
    613583    d->m_doc->deref();
    614584  d->m_doc = 0;
    615 
    616585  d->m_decoder = 0;
    617586
     
    633602    ConstFrameIt it = d->m_objects.begin();
    634603    ConstFrameIt end = d->m_objects.end();
    635     for(; it != end; ++it )
    636     {
     604    for(; it != end; ++it ) {
    637605      if ( (*it).m_frame )
    638       {
    639606        (*it).m_frame->deref();
    640       }
    641607    }
    642608  }
     
    10351001  checkEmitLoadEvent(); // if we didn't do it before
    10361002
    1037 
    10381003  if ( d->m_scheduledRedirection != noRedirectionScheduled )
    10391004  {
     
    10931058}
    10941059
     1060KURL Frame::baseURL() const
     1061{
     1062    if (!d->m_doc)
     1063        return KURL();
     1064    return d->m_doc->baseURL();
     1065}
     1066
     1067QString Frame::baseTarget() const
     1068{
     1069    if (!d->m_doc)
     1070        return QString();
     1071    return d->m_doc->baseTarget();
     1072}
     1073
    10951074KURL Frame::completeURL( const QString &url )
    10961075{
     
    11031082void Frame::scheduleRedirection( double delay, const QString &url, bool doLockHistory)
    11041083{
    1105     kdDebug(6050) << "Frame::scheduleRedirection delay=" << delay << " url=" << url << endl;
    11061084    if (delay < 0 || delay > INT_MAX / 1000)
    11071085      return;
  • trunk/WebCore/khtml/Frame.h

    r11975 r11976  
    130130  Frame(QWidget *parentWidget = 0, const char *widgetname = 0, QObject *parent = 0, const char *name = 0);
    131131  Frame(KHTMLView *view, QObject *parent = 0, const char *name = 0);
    132 
    133   /**
    134    * Destructor.
    135    */
     132 
    136133  virtual ~Frame();
    137134
     
    782779  virtual void customEvent( QCustomEvent *event );
    783780  virtual void khtmlMousePressEvent( khtml::MousePressEvent *event );
    784   virtual void khtmlMouseDoubleClickEvent( khtml::MouseDoubleClickEvent * );
     781  virtual void khtmlMouseDoubleClickEvent(khtml::MouseDoubleClickEvent*) { }
    785782  virtual void khtmlMouseMoveEvent( khtml::MouseMoveEvent *event );
    786783  virtual void khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event );
    787   virtual void khtmlDrawContentsEvent( khtml::DrawContentsEvent * );
     784  virtual void khtmlDrawContentsEvent(khtml::DrawContentsEvent*) { }
    788785 
    789786  void selectClosestWordFromMouseEvent(QMouseEvent *mouse, DOM::NodeImpl *innerNode, int x, int y);
     
    837834  void slotParentCompleted();
    838835  void slotChildURLRequest( const KURL &url, const KParts::URLArgs &args );
    839 
    840   void slotLoaderRequestStarted( khtml::DocLoader*, khtml::CachedObject* obj);
    841836  void slotLoaderRequestDone( khtml::DocLoader*, khtml::CachedObject *obj );
    842837  void checkCompleted();
  • trunk/WebCore/kwq/KWQLoader.mm

    r11966 r11976  
    4949
    5050bool 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{   
    5652    return KWQServeRequest(loader, request->m_docLoader, job);
    5753}
  • trunk/WebCore/kwq/KWQSlot.mm

    r11966 r11976  
    6969    slotFinishedParsing,
    7070    slotLoaderRequestDone,
    71     slotLoaderRequestStarted,
    7271    slotParentCompleted,
    7372    slotParentDestroyed,
     
    110109    CASE(slotFinishedParsing, (), Frame)
    111110    CASE(slotLoaderRequestDone, (khtml::DocLoader *, khtml::CachedObject *), Frame)
    112     CASE(slotLoaderRequestStarted, (khtml::DocLoader *, khtml::CachedObject *), Frame)
    113111    CASE(slotParentCompleted, (), Frame)
    114112    CASE(slotPerformSearch, (), RenderLineEdit)
     
    351349            static_cast<Frame *>(m_object.pointer())->slotLoaderRequestDone(loader, cachedObject);
    352350            return;
    353         case slotLoaderRequestStarted:
    354             static_cast<Frame *>(m_object.pointer())->slotLoaderRequestStarted(loader, cachedObject);
    355             return;
    356351    }
    357352   
Note: See TracChangeset for help on using the changeset viewer.