[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
abecsi at webkit.org
abecsi at webkit.org
Wed Dec 22 14:55:53 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit e5621fa0435d313b1fa1501f38a0c95867aef2bc
Author: abecsi at webkit.org <abecsi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 25 16:08:20 2010 +0000
2010-10-25 Andras Becsi <abecsi at webkit.org>
Reviewed by Csaba Osztrogonác.
[Qt] Fix the WebKit2 build after sheriffbot messed up the rollout patch.
https://bugs.webkit.org/show_bug.cgi?id=48238
* Shared/qt/MappedMemory.h: Renamed from WebKit2/Platform/qt/MappedMemoryPool.h.
(WebKit::MappedMemory::mapSize):
(WebKit::MappedMemory::markUsed):
(WebKit::MappedMemory::markFree):
(WebKit::MappedMemory::isFree):
(WebKit::MappedMemory::data):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70457 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index f951004..33ffb70 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-25 Andras Becsi <abecsi at webkit.org>
+
+ Reviewed by Csaba Osztrogonác.
+
+ [Qt] Fix the WebKit2 build after sheriffbot messed up the rollout patch.
+ https://bugs.webkit.org/show_bug.cgi?id=48238
+
+ * Shared/qt/MappedMemory.h: Renamed from WebKit2/Platform/qt/MappedMemoryPool.h.
+ (WebKit::MappedMemory::mapSize):
+ (WebKit::MappedMemory::markUsed):
+ (WebKit::MappedMemory::markFree):
+ (WebKit::MappedMemory::isFree):
+ (WebKit::MappedMemory::data):
+
2010-10-25 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r70450.
diff --git a/WebKit2/Platform/qt/MappedMemoryPool.h b/WebKit2/Platform/qt/MappedMemoryPool.h
deleted file mode 100644
index 14ca594..0000000
--- a/WebKit2/Platform/qt/MappedMemoryPool.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
- * Copyright (C) 2010 University of Szeged
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef MappedMemoryPool_h
-#define MappedMemoryPool_h
-
-#include <QFile>
-#include <wtf/Vector.h>
-
-namespace WebKit {
-
-class MappedMemoryPool {
-public:
- static MappedMemoryPool* instance();
-
- struct MappedMemory {
- QFile* file;
- struct Data {
- uint32_t isFree; // keep bytes aligned
- uchar bytes;
- };
- union {
- uchar* mappedBytes;
- Data* dataPtr;
- };
- size_t dataSize;
-
- size_t mapSize() const { return dataSize + sizeof(Data); }
- void markUsed() { dataPtr->isFree = false; }
- void markFree() { dataPtr->isFree = true; }
- bool isFree() const { return dataPtr->isFree; }
- uchar* data() const { return &dataPtr->bytes; }
- };
-
- MappedMemory* mapMemory(size_t size, QIODevice::OpenMode openMode = QIODevice::ReadWrite);
- MappedMemory* mapFile(QString fileName, size_t size, QIODevice::OpenMode openMode = QIODevice::ReadWrite);
- MappedMemory* searchForMappedMemory(uchar* p);
-
-private:
- MappedMemoryPool() { };
-
- Vector<MappedMemory> m_pool;
-};
-
-typedef MappedMemoryPool::MappedMemory MappedMemory;
-
-} // namespace WebKit
-
-#endif // MappedMemoryPool_h
diff --git a/WebKit2/Shared/qt/MappedMemory.h b/WebKit2/Shared/qt/MappedMemory.h
new file mode 100644
index 0000000..412c210
--- /dev/null
+++ b/WebKit2/Shared/qt/MappedMemory.h
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
+ * Copyright (C) 2010 University of Szeged
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef MappedMemory_h
+#define MappedMemory_h
+
+#include <QCoreApplication>
+#include <QFile>
+#include <wtf/Vector.h>
+
+namespace WebKit {
+struct MappedMemory {
+ QFile* file;
+ struct Data {
+ uint32_t isFree; // keep bytes aligned
+ uchar bytes;
+ };
+ union {
+ uchar* mappedBytes;
+ Data* dataPtr;
+ };
+ size_t dataSize;
+
+ size_t mapSize() const { return dataSize + sizeof(Data); }
+ void markUsed() { dataPtr->isFree = false; }
+ void markFree() { dataPtr->isFree = true; }
+ bool isFree() const { return dataPtr->isFree; }
+ uchar* data() const { return &dataPtr->bytes; }
+};
+
+class MappedMemoryPool : public QObject {
+ Q_OBJECT
+public:
+ static MappedMemoryPool* instance();
+ size_t size() const;
+ MappedMemory& at(size_t i);
+ MappedMemory& append(const MappedMemory&);
+
+private:
+ MappedMemoryPool();
+ Q_SLOT void cleanUp();
+
+ Vector<MappedMemory> m_pool;
+};
+} // namespace WebKit
+#endif // MappedMemory_h
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list