WebKit merge 41447:41498 [third_party/WebKit]

third_party/WebKit/WebCore/html/HTMLObjectElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Stefan Schimanski (1Stein@gmx.de)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 105 matching lines @@
     } else
         HTMLPlugInElement::parseMappedAttribute(attr);
 }
 
 bool HTMLObjectElement::rendererIsNeeded(RenderStyle* style)
 {
     Frame* frame = document()->frame();
     if (!frame)
         return false;
     
-    return HTMLPlugInElement::rendererIsNeeded(style);
+    // Temporary Workaround for Gears plugin - see bug 24215 for details and bug 24346 to track removal.
+    // Gears expects the plugin to be instantiated even if display:none is set
+    // for the object element.
+    bool isGearsPlugin = equalIgnoringCase(getAttribute(typeAttr), "application/x-googlegears");
+    return isGearsPlugin || HTMLPlugInElement::rendererIsNeeded(style);
 }
 
 RenderObject *HTMLObjectElement::createRenderer(RenderArena* arena, RenderStyle* style)
 {
     if (m_useFallbackContent)
         return RenderObject::createObject(this, style);
     if (isImageType())
         return new (arena) RenderImage(this);
     return new (arena) RenderPartObject(this);
 }
@@ skipping 300 matching lines @@
 void HTMLObjectElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) const
 {
     HTMLPlugInImageElement::addSubresourceAttributeURLs(urls);
 
     addSubresourceURL(urls, data());
     if (useMap().startsWith("#"))
         addSubresourceURL(urls, document()->completeURL(useMap()));
 }
 
 }