[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
kenneth at webkit.org
kenneth at webkit.org
Wed Dec 22 14:28:57 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit f094beae97c43db8c37b1e52c3db6b26f1bb6829
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 11 16:38:20 2010 +0000
Unlink the files used for I/O mapped memory as soon as they are
created.
Reviewed by Andreas Kling.
* Shared/qt/UpdateChunk.cpp:
(WebKit::mapMemory):
(WebKit::mapFile):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69502 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 8df2c24..4231377 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,16 @@
2010-10-11 Kenneth Rohde Christiansen <kenneth.christiansen at openbossa.org>
+ Reviewed by Andreas Kling.
+
+ Unlink the files used for I/O mapped memory as soon as they are
+ created.
+
+ * Shared/qt/UpdateChunk.cpp:
+ (WebKit::mapMemory):
+ (WebKit::mapFile):
+
+2010-10-11 Kenneth Rohde Christiansen <kenneth.christiansen at openbossa.org>
+
Rubberstamped by Andreas Kling.
Build fix when using MeeGo Touch
diff --git a/WebKit2/Shared/qt/UpdateChunk.cpp b/WebKit2/Shared/qt/UpdateChunk.cpp
index c58dfb7..15d0c2c 100644
--- a/WebKit2/Shared/qt/UpdateChunk.cpp
+++ b/WebKit2/Shared/qt/UpdateChunk.cpp
@@ -63,7 +63,7 @@ static MappedMemory* mapMemory(size_t size)
newMap.markUsed();
return &pool->append(newMap);
}
-
+
static MappedMemory* mapFile(QString fileName, size_t size)
{
MappedMemoryPool* pool = MappedMemoryPool::instance();
@@ -81,6 +81,7 @@ static MappedMemory* mapFile(QString fileName, size_t size)
newMap.data = newMap.file->map(0, size);
ASSERT(!newMap.isFree());
newMap.file->close();
+ newMap.file->remove(); // The map stays alive even when the file is unlinked.
return &pool->append(newMap);
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list