[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

andersca at apple.com andersca at apple.com
Wed Dec 22 15:55:51 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 5edf40938fbfab1d749c4ddb574c876a74363c02
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 16 21:15:28 2010 +0000

    Fix clang++ build.
    
    * WebCoreSupport/WebFrameLoaderClient.mm:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72129 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 549df93..70bd49c 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-16  Anders Carlsson  <andersca at apple.com>
+
+        Fix clang++ build.
+
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+
 2010-11-14  Kent Tamura  <tkent at chromium.org>
 
         Reviewed by Andreas Kling.
diff --git a/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm b/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
index 7ca27c0..5968084 100644
--- a/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
+++ b/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
@@ -1767,7 +1767,7 @@ PassRefPtr<Widget> WebFrameLoaderClient::createJavaAppletWidget(const IntSize& s
                 loadManually:NO
                 element:element] autorelease];
             if (view)
-                return adoptRef(new NetscapePluginWidget(view));
+                return adoptRef(new NetscapePluginWidget(static_cast<WebBaseNetscapePluginView *>(view)));
         } else {
             ASSERT_NOT_REACHED();
         }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list