Remove unused notification to avoid ERROR messages spewing on the acid2 test.

        Reviewed by darin

        * khtml/khtml_part.cpp:
        (KHTMLPart::processObjectRequest):
        * khtml/rendering/render_frames.cpp:
        (RenderPartObject::updateWidget):
        * khtml/rendering/render_frames.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@9098 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 534c410694c2041c8686319ad0b6d40c97859ebf..39298f9615225a4ba72324480a5acd2827e203ea 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2005-05-03  David Hyatt  <hyatt@apple.com>
+
+       Remove unused notification to avoid ERROR messages spewing on the acid2 test.
+       
+        Reviewed by darin
+
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::processObjectRequest):
+        * khtml/rendering/render_frames.cpp:
+        (RenderPartObject::updateWidget):
+        * khtml/rendering/render_frames.h:
+
 2005-05-03  Darin Adler  <darin@apple.com>
 
         Reviewed by Dave Hyatt.

diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index c7355d69e8d646e4da842cc5e440d7f3745d9859..3a5831cf73c1772d40cc628b36dc839cf0600f1b 100644 (file)
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -3259,12 +3259,7 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
     KParts::ReadOnlyPart *part = createPart( d->m_view->viewport(), child->m_name.ascii(), this, child->m_name.ascii(), mimetype, child->m_serviceName, child->m_services, child->m_params );
 #endif
 
-    if ( !part )
-    {
-        if ( child->m_frame )
-          if (child->m_frame->partLoadingErrorNotify( child, url, mimetype ))
-            return true; // we succeeded after all (a fallback was used)
-
+    if (!part) {
         checkEmitLoadEvent();
         return false;
     }

diff --git a/WebCore/khtml/rendering/render_frames.cpp b/WebCore/khtml/rendering/render_frames.cpp
index b7baae099031e8e736184233f17b2acb4bf06da3..a5ec8a401ddf3ba2b09e02d5acca3fc37dd7f8a3 100644 (file)
--- a/WebCore/khtml/rendering/render_frames.cpp
+++ b/WebCore/khtml/rendering/render_frames.cpp
@@ -607,11 +607,6 @@ void RenderPart::setWidget( QWidget *widget )
     slotViewCleared();
 }
 
-bool RenderPart::partLoadingErrorNotify(khtml::ChildFrame *, const KURL& , const QString& )
-{
-    return false;
-}
-
 void RenderPart::slotViewCleared()
 {
 }
@@ -866,94 +861,6 @@ void RenderPartObject::updateWidget()
   }
 }
 
-bool RenderPartObject::partLoadingErrorNotify( khtml::ChildFrame *childFrame, const KURL& url, const QString& serviceType )
-{
-    KHTMLPart *part = static_cast<KHTMLView *>(m_view)->part();
-    //kdDebug() << "RenderPartObject::partLoadingErrorNotify serviceType=" << serviceType << endl;
-    // Check if we just tried with e.g. nsplugin
-    // and fallback to the activexhandler if there is a classid
-    // and a codebase, where we may download the ocx if it's missing
-    if( serviceType != "application/x-activex-handler" && element()->id()==ID_OBJECT ) {
-
-        // check for embed child object
-        HTMLObjectElementImpl *o = static_cast<HTMLObjectElementImpl *>(element());
-        HTMLEmbedElementImpl *embed = 0;
-        NodeImpl *child = o->firstChild();
-        while ( child ) {
-            if ( child->id() == ID_EMBED )
-                embed = static_cast<HTMLEmbedElementImpl *>( child );
-
-            child = child->nextSibling();
-        }
-        if( embed && !o->classId.isEmpty() &&
-            !( static_cast<ElementImpl *>(o)->getAttribute(ATTR_CODEBASE).string() ).isEmpty() )
-        {
-            KParts::URLArgs args;
-            args.serviceType = "application/x-activex-handler";
-            if (part->requestObject( childFrame, url, args ))
-                return true; // success
-        }
-    }
-    // Dissociate ourselves from the current event loop (to prevent crashes
-    // due to the message box staying up)
-    QTimer::singleShot( 0, this, SLOT( slotPartLoadingErrorNotify() ) );
-    Tokenizer *tokenizer = static_cast<DOM::DocumentImpl *>(part->document().handle())->tokenizer();
-    if (tokenizer) tokenizer->setOnHold( true );
-    slotPartLoadingErrorNotify();
-    if (tokenizer) tokenizer->setOnHold( false );
-    return false;
-}
-
-void RenderPartObject::slotPartLoadingErrorNotify()
-{
-#if APPLE_CHANGES
-    // FIXME: What are we going to do for this case?
-#else
-    // First we need to find out the servicetype - again - this code is too duplicated !
-    HTMLEmbedElementImpl *embed = 0;
-    QString serviceType;
-    if( element()->id()==ID_OBJECT ) {
-
-        // check for embed child object
-        HTMLObjectElementImpl *o = static_cast<HTMLObjectElementImpl *>(element());
-        serviceType = o->serviceType;
-        NodeImpl *child = o->firstChild();
-        while ( child ) {
-            if ( child->id() == ID_EMBED )
-                embed = static_cast<HTMLEmbedElementImpl *>( child );
-
-            child = child->nextSibling();
-        }
-
-    } else if( element()->id()==ID_EMBED ) {
-        embed = static_cast<HTMLEmbedElementImpl *>(element());
-    }
-    if ( embed )
-       serviceType = embed->serviceType;
-
-    KHTMLPart *part = static_cast<KHTMLView *>(m_view)->part();
-    KParts::BrowserExtension *ext = part->browserExtension();
-    if( embed && !embed->pluginPage.isEmpty() && ext ) {
-        // Prepare the mimetype to show in the question (comment if available, name as fallback)
-        QString mimeName = serviceType;
-        KMimeType::Ptr mime = KMimeType::mimeType(serviceType);
-        if ( mime->name() != KMimeType::defaultMimeType() )
-            mimeName = mime->comment();
-        // Prepare the URL to show in the question (host only if http, to make it short)
-        KURL pluginPageURL( embed->pluginPage );
-        QString shortURL = pluginPageURL.protocol() == "http" ? pluginPageURL.host() : pluginPageURL.prettyURL();
-        int res = KMessageBox::questionYesNo( m_view,
-            i18n("No plugin found for '%1'.\nDo you want to download one from %2?").arg(mimeName).arg(shortURL),
-           i18n("Missing plugin"), QString::null, QString::null, QString("plugin-")+serviceType);
-       if ( res == KMessageBox::Yes )
-       {
-          // Display vendor download page
-          ext->createNewWindow( pluginPageURL );
-       }
-    }
-#endif // APPLE_CHANGES
-}
-
 void RenderPartObject::layout( )
 {
     KHTMLAssert( needsLayout() );

diff --git a/WebCore/khtml/rendering/render_frames.h b/WebCore/khtml/rendering/render_frames.h
index c080046455a7852bf45709458d25944428c86bf4..3a899b3c6a48907a1ebe795f8d5558f21f9a32a6 100644 (file)
--- a/WebCore/khtml/rendering/render_frames.h
+++ b/WebCore/khtml/rendering/render_frames.h
@@ -105,19 +105,6 @@ public:
     // layouts using WebCore when objects resize.
     void updateWidgetPositions();
 #endif
-    
-    /**
-     * Called by KHTMLPart to notify the frame object that loading the
-     * part was not successfuly. (called either asyncroniously after a
-     * after the servicetype of the given url (the one passed with requestObject)
-     * has been determined or syncroniously from within requestObject)
-     *
-     * The default implementation does nothing.
-     *
-     * Return false in the normal case, return true if a fallback was found
-     * and the url was successfully opened.
-     */
-    virtual bool partLoadingErrorNotify( khtml::ChildFrame *childFrame, const KURL& url, const QString& serviceType );
 
     bool hasFallbackContent() const { return m_hasFallbackContent; }
 
@@ -155,14 +142,10 @@ public:
     virtual void layout( );
     virtual void updateWidget();
 
-    virtual bool partLoadingErrorNotify( khtml::ChildFrame *childFrame, const KURL& url, const QString& serviceType );
-
 public slots:
     void slotViewCleared();
-private slots:
-    void slotPartLoadingErrorNotify();
 };
 
-};
+}
 
 #endif