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

third_party/WebKit/WebCore/rendering/RenderPartObject.cpp

Index: third_party/WebKit/WebCore/rendering/RenderPartObject.cpp
===================================================================
--- third_party/WebKit/WebCore/rendering/RenderPartObject.cpp	(revision 11711)
+++ third_party/WebKit/WebCore/rendering/RenderPartObject.cpp	(working copy)
@@ -132,10 +132,17 @@
 
 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)