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

List:       kde-commits
Subject:    kdelibs/khtml/rendering
From:       Koos Vriezen <koos.vriezen () xs4all ! nl>
Date:       2005-02-01 18:51:16
Message-ID: 20050201185116.EFFF21BB32 () office ! kde ! org
[Download RAW message or body]

CVS commit by vriezen: 

Only take servicetype from embed if it actually has one. Fixes
http://www.apple.com/trailers/lions_gate/aloneinthedark/large.html

CCMAIL: zefo@seznam.cz

Thanks for your report.


  M +4 -5      render_frames.cpp   1.193


--- kdelibs/khtml/rendering/render_frames.cpp  #1.192:1.193
@@ -605,5 +605,4 @@ void RenderPartObject::updateWidget()
   } else {
 
-      QString serviceType;
       QStringList params;
       HTMLObjectBaseElementImpl * objbase = static_cast<HTMLObjectBaseElementImpl *>(element());
@@ -645,7 +644,7 @@ void RenderPartObject::updateWidget()
 
       HTMLEmbedElementImpl *embed = 0;
+      QString serviceType = objbase->serviceType;
       if ( element()->id() == ID_EMBED ) {
 
-          serviceType = objbase->serviceType;
           embed = static_cast<HTMLEmbedElementImpl *>( objbase );
 
@@ -670,10 +669,10 @@ void RenderPartObject::updateWidget()
               // render embed object
               url = embed->url;
+              if (!embed->serviceType.isEmpty())
               serviceType = embed->serviceType;
           } else if (url.isEmpty() && objbase->classId.startsWith("java:")) {
               serviceType = "application/x-java-applet";
               url = objbase->classId.mid(5);
-          } else
-              serviceType = objbase->serviceType;
+          }
           if(serviceType.isEmpty() && !objbase->classId.isEmpty()) {
 


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