[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[ddkilzer at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 1230fa5971b913c3e5919b7055335450746b228e
Author: ddkilzer at apple.com <ddkilzer at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 4 20:47:06 2011 +0000

    <http://webkit.org/b/51889> WebFrameLoaderClient::createMediaPlayerProxyPlugin() should use WebCore::PluginInfo.name
    
    Reviewed by Eric Carlson.
    
    This originally broke in r61581.  It is inside an
    ENABLE(PLUGIN_PROXY_FOR_VIDEO) macro, so it didn't break the Mac
    build then.
    
    * WebCoreSupport/WebFrameLoaderClient.mm: Call
    (WebFrameLoaderClient::createMediaPlayerProxyPlugin): Updated to
    use WebCore::PluginInfo.name instead of
    -[WebBasePluginPackage name].
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74996 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 15cbf23..ba5025d 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,18 @@
+2011-01-04  David Kilzer  <ddkilzer at apple.com>
+
+        <http://webkit.org/b/51889> WebFrameLoaderClient::createMediaPlayerProxyPlugin() should use WebCore::PluginInfo.name
+
+        Reviewed by Eric Carlson.
+
+        This originally broke in r61581.  It is inside an
+        ENABLE(PLUGIN_PROXY_FOR_VIDEO) macro, so it didn't break the Mac
+        build then.
+
+        * WebCoreSupport/WebFrameLoaderClient.mm: Call
+        (WebFrameLoaderClient::createMediaPlayerProxyPlugin): Updated to
+        use WebCore::PluginInfo.name instead of
+        -[WebBasePluginPackage name].
+
 2011-01-02  Dan Bernstein  <mitz at apple.com>
 
         Rubber-stamped by Simon Fraser.
diff --git a/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm b/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
index 3198a30..227d13a 100644
--- a/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
+++ b/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
@@ -1866,7 +1866,7 @@ PassRefPtr<Widget> WebFrameLoaderClient::createMediaPlayerProxyPlugin(const IntS
 
     if (errorCode) {
         NSError *error = [[NSError alloc] _initWithPluginErrorCode:errorCode
-            contentURL:URL pluginPageURL:nil pluginName:[pluginPackage name] MIMEType:mimeType];
+            contentURL:URL pluginPageURL:nil pluginName:[pluginPackage pluginInfo].name MIMEType:mimeType];
         WebNullPluginView *nullView = [[[WebNullPluginView alloc] initWithFrame:NSMakeRect(0, 0, size.width(), size.height())
             error:error DOMElement:kit(element)] autorelease];
         view = nullView;

-- 
WebKit Debian packaging