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

List:       kde-commits
Subject:    KDE/kdelibs/khtml/html
From:       Maks Orlovich <maksim () kde ! org>
Date:       2010-11-04 14:54:57
Message-ID: 20101104145457.4A480AC89B () svn ! kde ! org
[Download RAW message or body]

SVN commit 1193090 by orlovich:

Make !pluginsEnabled() work proeprly rather than do some weirdo attach/detach dance

BUG: 208780


 M  +7 -10     html_objectimpl.cpp  


--- trunk/KDE/kdelibs/khtml/html/html_objectimpl.cpp #1193089:1193090
@@ -509,6 +509,12 @@
         KHTMLPart* p = document()->part();
         if (!p || !p->javaEnabled())
             newRenderAlternative = true;
+    } else {    
+        // Similarly for plugins.
+        KHTMLPart* p = document()->part();
+
+        if (!p || !p->pluginsEnabled())
+            newRenderAlternative = true;
     }
 
     // If there is no <embed> (here or as a child), and we don't have a type + url to go on,
@@ -740,11 +746,6 @@
 
 void HTMLEmbedElementImpl::attach()
 {
-    KHTMLPart* p = document()->part();
-
-    if (!p || !p->pluginsEnabled())
-        m_renderAlternative = true;
-
     if (parentNode()->id() == ID_OBJECT)
         NodeBaseImpl::attach();
     else
@@ -827,11 +828,6 @@
 
 void HTMLObjectElementImpl::attach()
 {
-    KHTMLPart* p = document()->part();
-
-    if (!p || !p->pluginsEnabled())
-        m_renderAlternative = true;
-
     HTMLObjectBaseElementImpl::attach();
 }
 
@@ -861,3 +857,4 @@
 }
 
 #include "html_objectimpl.moc"
+// kate: indent-width 4; replace-tabs on; tab-width 4; space-indent on;
[prev in list] [next in list] [prev in thread] [next in thread]