Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733)

New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.

1 files changed, 104 insertions, 0 deletions

diff --git a/Source/WebKit/chromium/tests/MemoryInstrumentationTest.cpp b/Source/WebKit/chromium/tests/MemoryInstrumentationTest.cpp
new file mode 100644
index 000000000..72aa15a30
--- /dev/null
+++ b/Source/WebKit/chromium/tests/MemoryInstrumentationTest.cpp
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2012 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * 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.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
+ * OWNER OR 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.
+ */
+
+#include "config.h"
+
+#include "CachedImage.h"
+#include "MemoryInstrumentationImpl.h"
+#include <gtest/gtest.h>
+#include <wtf/MemoryInstrumentation.h>
+#include <wtf/OwnPtr.h>
+
+using namespace WebCore;
+
+using WTF::MemoryObjectInfo;
+using WTF::MemoryClassInfo;
+using WTF::MemoryObjectType;
+
+namespace {
+
+MemoryObjectType TestType = "TestType";
+
+class ImageObserverTestHelper {
+public:
+    ImageObserverTestHelper()
+        : m_cachedImage(adoptPtr(new CachedImage(0)))
+        , m_imageOberver(m_cachedImage.get())
+    {
+    }
+    void reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
+    {
+        MemoryClassInfo info(memoryObjectInfo, this, TestType);
+        info.addMember(m_cachedImage);
+        info.addMember(m_imageOberver);
+    }
+
+    OwnPtr<CachedImage> m_cachedImage;
+    ImageObserver* m_imageOberver;
+};
+
+TEST(MemoryInstrumentationTest, ImageObserver)
+{
+    ImageObserverTestHelper helper;
+
+    class TestClient : public MemoryInstrumentationClientImpl {
+    public:
+        TestClient(const void* expectedPointer, const void* unexpectedPointer)
+            : m_expectedPointer(expectedPointer)
+            , m_unexpectedPointer(unexpectedPointer)
+            , m_expectedPointerFound(false)
+        {
+            EXPECT_NE(expectedPointer, unexpectedPointer);
+        }
+        virtual void countObjectSize(const void* pointer, MemoryObjectType type, size_t size) OVERRIDE
+        {
+            EXPECT_NE(m_unexpectedPointer, pointer);
+            if (m_expectedPointer == pointer)
+                m_expectedPointerFound = true;
+            MemoryInstrumentationClientImpl::countObjectSize(pointer, type, size);
+        }
+
+        bool expectedPointerFound() { return m_expectedPointerFound; }
+
+    private:
+        const void* m_expectedPointer;
+        const void* m_unexpectedPointer;
+        bool m_expectedPointerFound;
+    } client(helper.m_cachedImage.get(), helper.m_imageOberver);
+    MemoryInstrumentationImpl instrumentation(&client);
+    instrumentation.addRootObject(helper);
+    EXPECT_TRUE(client.expectedPointerFound());
+    EXPECT_LE(sizeof(CachedImage), client.reportedSizeForAllTypes());
+    EXPECT_LE(1u, client.totalCountedObjects());
+}
+
+
+} // namespace
+