Merge WebKit at r75993: Initial merge by git.

Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3

1 files changed, 0 insertions, 108 deletions

diff --git a/WebKit/chromium/src/WebCache.cpp b/WebKit/chromium/src/WebCache.cpp
deleted file mode 100644
index 2203498..0000000
--- a/WebKit/chromium/src/WebCache.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2009 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 "WebCache.h"
-
-// Instead of providing accessors, we make all members of MemoryCache public.
-// This will make it easier to track WebCore changes to the MemoryCache class.
-// FIXME: We should introduce public getters on the MemoryCache class.
-#define private public
-#include "MemoryCache.h"
-#undef private
-
-using namespace WebCore;
-
-namespace WebKit {
-
-// A helper method for coverting a MemoryCache::TypeStatistic to a
-// WebCache::ResourceTypeStat.
-static void ToResourceTypeStat(const MemoryCache::TypeStatistic& from,
-                               WebCache::ResourceTypeStat& to)
-{
-    to.count = static_cast<size_t>(from.count);
-    to.size = static_cast<size_t>(from.size);
-    to.liveSize = static_cast<size_t>(from.liveSize);
-    to.decodedSize = static_cast<size_t>(from.decodedSize);
-}
-
-void WebCache::setCapacities(
-    size_t minDeadCapacity, size_t maxDeadCapacity, size_t capacity)
-{
-    MemoryCache* cache = WebCore::cache();
-    if (cache)
-        cache->setCapacities(static_cast<unsigned int>(minDeadCapacity),
-                             static_cast<unsigned int>(maxDeadCapacity),
-                             static_cast<unsigned int>(capacity));
-}
-
-void WebCache::clear()
-{
-    MemoryCache* cache = WebCore::cache();
-    if (cache && !cache->disabled()) {
-        cache->setDisabled(true);
-        cache->setDisabled(false);
-    }
-}
-
-void WebCache::getUsageStats(UsageStats* result)
-{
-    ASSERT(result);
-
-    MemoryCache* cache = WebCore::cache();
-    if (cache) {
-        result->minDeadCapacity = cache->m_minDeadCapacity;
-        result->maxDeadCapacity = cache->m_maxDeadCapacity;
-        result->capacity = cache->m_capacity;
-        result->liveSize = cache->m_liveSize;
-        result->deadSize = cache->m_deadSize;
-    } else
-        memset(result, 0, sizeof(UsageStats));
-}
-
-void WebCache::getResourceTypeStats(ResourceTypeStats* result)
-{
-    MemoryCache* cache = WebCore::cache();
-    if (cache) {
-        MemoryCache::Statistics stats = cache->getStatistics();
-        ToResourceTypeStat(stats.images, result->images);
-        ToResourceTypeStat(stats.cssStyleSheets, result->cssStyleSheets);
-        ToResourceTypeStat(stats.scripts, result->scripts);
-#if ENABLE(XSLT)
-        ToResourceTypeStat(stats.xslStyleSheets, result->xslStyleSheets);
-#else
-        memset(&result->xslStyleSheets, 0, sizeof(result->xslStyleSheets));
-#endif
-        ToResourceTypeStat(stats.fonts, result->fonts);
-    } else
-        memset(result, 0, sizeof(WebCache::ResourceTypeStats));
-}
-
-}  // namespace WebKit