[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
alex at webkit.org
alex at webkit.org
Sun Feb 20 23:27:02 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 252fa1d3753ecc0fc879fdd018030160e497e01d
Author: alex at webkit.org <alex at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 20 16:55:35 2011 +0000
2011-01-20 Alejandro G. Castro <alex at igalia.com>
Fix compilation error in GTK WebKit2.
* Platform/CoreIPC/gtk/ConnectionGtk.cpp:
(CoreIPC::readBytesFromSocket):
(CoreIPC::writeBytesToSocket):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76252 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index e34aa6f..fd72c75 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-20 Alejandro G. Castro <alex at igalia.com>
+
+ Fix compilation error in GTK WebKit2.
+
+ * Platform/CoreIPC/gtk/ConnectionGtk.cpp:
+ (CoreIPC::readBytesFromSocket):
+ (CoreIPC::writeBytesToSocket):
+
2011-01-20 Zoltan Horvath <zoltan at webkit.org>
Reviewed by Csaba Osztrogonác.
diff --git a/Source/WebKit2/Platform/CoreIPC/gtk/ConnectionGtk.cpp b/Source/WebKit2/Platform/CoreIPC/gtk/ConnectionGtk.cpp
index 65b1254..d561110 100644
--- a/Source/WebKit2/Platform/CoreIPC/gtk/ConnectionGtk.cpp
+++ b/Source/WebKit2/Platform/CoreIPC/gtk/ConnectionGtk.cpp
@@ -41,7 +41,7 @@ static const size_t initialMessageBufferSize = 4096;
static int readBytesFromSocket(int fileDescriptor, uint8_t* ptr, size_t length)
{
ASSERT(fileDescriptor > 0);
- ASSERT(buffer);
+ ASSERT(ptr);
ASSERT(length > 0);
ssize_t numberOfBytesRead = 0;
@@ -69,7 +69,7 @@ static int readBytesFromSocket(int fileDescriptor, uint8_t* ptr, size_t length)
static bool writeBytesToSocket(int fileDescriptor, uint8_t* ptr, size_t length)
{
ASSERT(fileDescriptor > 0);
- ASSERT(buffer);
+ ASSERT(ptr);
ASSERT(length > 0);
ssize_t numberOfBytesWritten = 0;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list