WebKit merge 41660:41709 (WebKit side)....

third_party/WebKit/WebCore/rendering/RenderPartObject.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Simon Hausmann <hausmann@kde.org>
  *           (C) 2000 Stefan Schimanski (1Stein@gmx.de)
  * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved.
  *
  * 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
  * version 2 of the License, or (at your option) any later version.
@@ skipping 114 matching lines @@
     // for the MIME type we came up with, ignore the MIME type we came up with and just use
     // the ActiveX type.
     if (havePlugin(pluginData, activeXType()) && !havePlugin(pluginData, type))
         return activeXType();
 
     return type;
 }
 
 static inline bool shouldUseEmbedDescendant(HTMLObjectElement* objectElement, const PluginData* pluginData)
 {
+#if PLATFORM(MAC)
+    UNUSED_PARAM(objectElement);
+    UNUSED_PARAM(pluginData);
+    // On Mac, we always want to use the embed descendant.
+    return true;
+#else
     // If we have both an <object> and <embed>, we always want to use the <embed> except when we have
     // an ActiveX plug-in and plan to use it.
     return !(havePlugin(pluginData, activeXType())
         && serviceTypeForClassId(objectElement->classId(), pluginData) == activeXType());
+#endif
 }
 
 void RenderPartObject::updateWidget(bool onlyCreateNonNetscapePlugins)
 {
     String url;
     String serviceType;
     Vector<String> paramNames;
     Vector<String> paramValues;
     Frame* frame = m_view->frame();
 
@@ skipping 199 matching lines @@
             marginh = frame->getMarginHeight();
         }
         if (marginw != -1)
             view->setMarginWidth(marginw);
         if (marginh != -1)
             view->setMarginHeight(marginh);
     }
 }
 
 }