[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
andersca at apple.com
andersca at apple.com
Thu Oct 29 20:48:02 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit f9d35fab51ecaea808f1f0e05777c247b46ab0d7
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 19 21:01:00 2009 +0000
Fix build.
* Plugins/WebNetscapePluginView.mm:
(-[WebNetscapePluginView saveAndSetNewPortStateForUpdate:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49807 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 697efdd..7856323 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-19 Anders Carlsson <andersca at apple.com>
+
+ Fix build.
+
+ * Plugins/WebNetscapePluginView.mm:
+ (-[WebNetscapePluginView saveAndSetNewPortStateForUpdate:]):
+
2009-10-19 Dan Bernstein <mitz at apple.com>
Reviewed by Anders Carlsson.
diff --git a/WebKit/mac/Plugins/WebNetscapePluginView.mm b/WebKit/mac/Plugins/WebNetscapePluginView.mm
index e581c2c..135d45a 100644
--- a/WebKit/mac/Plugins/WebNetscapePluginView.mm
+++ b/WebKit/mac/Plugins/WebNetscapePluginView.mm
@@ -402,7 +402,7 @@ static inline void getNPRect(const NSRect& nr, NPRect& npr)
QDErr err = NewGWorldFromPtr(&newOffscreenGWorld,
getQDPixelFormatForBitmapContext(currentContext), &offscreenBounds, 0, 0, 0,
static_cast<char*>(offscreenData), CGBitmapContextGetBytesPerRow(currentContext));
- ASSERT(newOffscreenGWorld)
+ ASSERT(newOffscreenGWorld);
ASSERT(!err);
if (!err) {
if (offscreenGWorld)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list