Reviewed by Darin Adler.

        - fix a regression from r30741: a crash under
          WebFrameLoaderClient::createPlugin() when showing a Mail message with
          an attachment

        * WebCoreSupport/WebFrameLoaderClient.mm:
        (WebFrameLoaderClient::createPlugin):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@30856 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 5f833cd70ed1e46650108d4734d0b74cbfefd9ee..3c348efaf098b535a45dbaf6209fc8383a86f5aa 100644 (file)
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,14 @@
+2008-03-06  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        - fix a regression from r30741: a crash under
+          WebFrameLoaderClient::createPlugin() when showing a Mail message with
+          an attachment
+
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+        (WebFrameLoaderClient::createPlugin):
+
 2008-03-06  Darin Adler  <darin@apple.com>
 
         - fix Tiger build

diff --git a/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm b/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
index 21b27a5108550752934faafd9dc2915e48c43bbf..fcc68941c1e79c19ffcdc4ac1b40a711d6d247e6 100644 (file)
--- a/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
+++ b/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
@@ -1295,7 +1295,7 @@ Widget* WebFrameLoaderClient::createPlugin(const IntSize& size, Element* element
             attributes, WebPlugInAttributesKey,
             [NSNumber numberWithInt:loadManually ? WebPlugInModeFull : WebPlugInModeEmbed], WebPlugInModeKey,
             [NSNumber numberWithBool:!loadManually], WebPlugInShouldLoadMainResourceKey,
-            element, WebPlugInContainingElementKey,
+            kit(element), WebPlugInContainingElementKey,
             URL, WebPlugInBaseURLKey, // URL might be nil, so add it last
             nil];