[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.0/kdelibs/khtml
From:       Maks Orlovich <maksim () kde ! org>
Date:       2008-01-14 2:25:45
Message-ID: 1200277545.013416.22573.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 761087 by orlovich:

- Remove hacks for activeX/reaktivate, in preparation for major
object/iframe fixes work...


 M  +1 -2      khtml_part.cpp  
 M  +3 -17     rendering/render_frames.cpp  
 M  +2 -5      rendering/render_frames.h  


--- branches/KDE/4.0/kdelibs/khtml/khtml_part.cpp #761086:761087
@@ -4425,8 +4425,7 @@
     if ( !part )
     {
         if ( child->m_frame )
-          if (child->m_frame->partLoadingErrorNotify( child, url, mimetype ))
-            return true; // we succeeded after all (a fallback was used)
+          child->m_frame->partLoadingErrorNotify( child, url, mimetype );
 
         checkEmitLoadEvent();
         return false;
--- branches/KDE/4.0/kdelibs/khtml/rendering/render_frames.cpp #761086:761087
@@ -644,10 +644,8 @@
     slotViewCleared();
 }
 
-bool RenderPart::partLoadingErrorNotify(khtml::ChildFrame *, const KUrl& , const \
                QString& )
-{
-    return false;
-}
+void RenderPart::partLoadingErrorNotify(khtml::ChildFrame *, const KUrl& , const \
QString& ) +{}
 
 short RenderPart::intrinsicWidth() const
 {
@@ -857,7 +855,7 @@
 }
 
 
-bool RenderPartObject::partLoadingErrorNotify( khtml::ChildFrame *childFrame, const \
KUrl& url, const QString& serviceType ) +void \
RenderPartObject::partLoadingErrorNotify( khtml::ChildFrame *childFrame, const KUrl& \
url, const QString& serviceType )  {
     KHTMLPart *part = static_cast<KHTMLView *>(m_view)->part();
     kDebug(6031) << "RenderPartObject::partLoadingErrorNotify serviceType=" << \
serviceType; @@ -876,17 +874,6 @@
 
             child = child->nextSibling();
         }
-        if( embed && !o->classId.isEmpty() &&
-            !( static_cast<ElementImpl *>(o)->getAttribute(ATTR_CODEBASE).string() \
                ).isEmpty() )
-        {
-            KParts::OpenUrlArguments args;
-            args.setMimeType("application/x-activex-handler");
-            kDebug(6031) << "set to activex";
-            if (part->requestObject( childFrame, url, args ))
-                return true; // success
-
-            return false;
-        }
     }
     // Dissociate ourselves from the current event loop (to prevent crashes
     // due to the message box staying up)
@@ -897,7 +884,6 @@
     slotPartLoadingErrorNotify();
     if (tokenizer) tokenizer->setOnHold( false );
 #endif
-    return false;
 }
 
 void RenderPartObject::slotPartLoadingErrorNotify()
--- branches/KDE/4.0/kdelibs/khtml/rendering/render_frames.h #761086:761087
@@ -107,11 +107,8 @@
      * 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 ); +    virtual void partLoadingErrorNotify( \
khtml::ChildFrame *childFrame, const KUrl& url, const QString& serviceType );  
     virtual short intrinsicWidth() const;
     virtual int intrinsicHeight() const;
@@ -158,7 +155,7 @@
     
     virtual bool canHaveBorder() const { return true; }
 
-    virtual bool partLoadingErrorNotify( khtml::ChildFrame *childFrame, const KUrl& \
url, const QString& serviceType ); +    virtual void partLoadingErrorNotify( \
khtml::ChildFrame *childFrame, const KUrl& url, const QString& serviceType );  
 public Q_SLOTS:
     void slotViewCleared();


[prev in list] [next in list] [prev in thread] [next in thread]