[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
weinig at apple.com
weinig at apple.com
Wed Dec 22 17:53:29 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit db131323a1dfec35cf99427aae68da3d74ed017b
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 2 02:56:24 2010 +0000
Fix 64-bit build.
* WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:
(WebKit::NetscapePlugin::windowAndViewFramesChanged):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73098 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 2189e1a..d19f979 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-01 Sam Weinig <sam at webkit.org>
+
+ Fix 64-bit build.
+
+ * WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:
+ (WebKit::NetscapePlugin::windowAndViewFramesChanged):
+
2010-12-01 Anders Carlsson <andersca at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm b/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm
index 525751a..4f2afc0 100644
--- a/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm
+++ b/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm
@@ -633,9 +633,9 @@ void NetscapePlugin::windowAndViewFramesChanged(const WebCore::IntRect& windowFr
Rect bounds = computeFakeWindowBoundsRect(windowFrameInScreenCoordinates, viewFrameInWindowCoordinates);
::SetWindowBounds(windowRef(), kWindowStructureRgn, &bounds);
-#endif
break;
}
+#endif
default:
ASSERT_NOT_REACHED();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list