2010-06-02 Mikhail Naganov <mnaganov@chromium.org>
authormnaganov@chromium.org <mnaganov@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 2 Jun 2010 14:30:34 +0000 (14:30 +0000)
committermnaganov@chromium.org <mnaganov@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 2 Jun 2010 14:30:34 +0000 (14:30 +0000)
        Unreviewed, rolling out r60563.
        http://trac.webkit.org/changeset/60563
        https://bugs.webkit.org/show_bug.cgi?id=39646

        windows build failed

        * fast/dom/Window/window-properties-expected.txt:
        * platform/gtk/fast/dom/Window/window-properties-expected.txt:
        * platform/qt/fast/dom/Window/window-properties-expected.txt:
2010-06-02  Mikhail Naganov  <mnaganov@chromium.org>

        Unreviewed, rolling out r60563.
        http://trac.webkit.org/changeset/60563
        https://bugs.webkit.org/show_bug.cgi?id=39646

        windows build failed

        * CMakeLists.txt:
        * DerivedSources.cpp:
        * DerivedSources.make:
        * GNUmakefile.am:
        * WebCore.gypi:
        * WebCore.pri:
        * WebCore.pro:
        * WebCore.vcproj/WebCore.vcproj:
        * WebCore.xcodeproj/project.pbxproj:
        * bindings/js/JSConsoleCustom.cpp:
        * bindings/v8/custom/V8ConsoleCustom.cpp:
        * page/Console.h:
        * page/Console.idl:
        * page/MemoryInfo.cpp: Removed.
        * page/MemoryInfo.h: Removed.
        * page/MemoryInfo.idl: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@60565 268f45cc-cd09-0410-ab3c-d52691b4dbfc

21 files changed:
LayoutTests/ChangeLog
LayoutTests/fast/dom/Window/window-properties-expected.txt
LayoutTests/platform/gtk/fast/dom/Window/window-properties-expected.txt
LayoutTests/platform/qt/fast/dom/Window/window-properties-expected.txt
WebCore/CMakeLists.txt
WebCore/ChangeLog
WebCore/DerivedSources.cpp
WebCore/DerivedSources.make
WebCore/GNUmakefile.am
WebCore/WebCore.gypi
WebCore/WebCore.pri
WebCore/WebCore.pro
WebCore/WebCore.vcproj/WebCore.vcproj
WebCore/WebCore.xcodeproj/project.pbxproj
WebCore/bindings/js/JSConsoleCustom.cpp
WebCore/bindings/v8/custom/V8ConsoleCustom.cpp
WebCore/page/Console.h
WebCore/page/Console.idl
WebCore/page/MemoryInfo.cpp [deleted file]
WebCore/page/MemoryInfo.h [deleted file]
WebCore/page/MemoryInfo.idl [deleted file]

index 4facc66..27844e2 100644 (file)
@@ -1,5 +1,17 @@
 2010-06-02  Mikhail Naganov  <mnaganov@chromium.org>
 
+        Unreviewed, rolling out r60563.
+        http://trac.webkit.org/changeset/60563
+        https://bugs.webkit.org/show_bug.cgi?id=39646
+
+        windows build failed
+
+        * fast/dom/Window/window-properties-expected.txt:
+        * platform/gtk/fast/dom/Window/window-properties-expected.txt:
+        * platform/qt/fast/dom/Window/window-properties-expected.txt:
+
+2010-06-02  Mikhail Naganov  <mnaganov@chromium.org>
+
         Reviewed by Yury Semikhatsky.
 
         Web Inspector: add Console API for retrieving memory stats
index 82dfab9..fcdd88f 100644 (file)
@@ -2060,9 +2060,6 @@ window.console.groupEnd [function]
 window.console.info [function]
 window.console.log [function]
 window.console.markTimeline [function]
-window.console.memory [object MemoryInfo]
-window.console.memory.totalJSHeapSize [number]
-window.console.memory.usedJSHeapSize [number]
 window.console.profile [function]
 window.console.profileEnd [function]
 window.console.profiles [object Array]
index c9e50cb..d2e5d85 100644 (file)
@@ -1678,9 +1678,6 @@ window.console.group [function]
 window.console.groupEnd [function]
 window.console.info [function]
 window.console.log [function]
-window.console.memory [object MemoryInfo]
-window.console.memory.totalJSHeapSize [number]
-window.console.memory.usedJSHeapSize [number]
 window.console.profile [function]
 window.console.profileEnd [function]
 window.console.profiles [object Array]
index d9b5102..f6756bf 100644 (file)
@@ -2032,9 +2032,6 @@ window.console.groupEnd [function]
 window.console.info [function]
 window.console.log [function]
 window.console.markTimeline [function]
-window.console.memory [object MemoryInfo]
-window.console.memory.totalJSHeapSize [number]
-window.console.memory.usedJSHeapSize [number]
 window.console.profile [function]
 window.console.profileEnd [function]
 window.console.profiles [object Array]
index 1adcade..aa3a320 100644 (file)
@@ -307,7 +307,6 @@ SET(WebCore_IDL_FILES
     page/Geoposition.idl
     page/History.idl
     page/Location.idl
-    page/MemoryInfo.idl
     page/Navigator.idl
     page/PositionError.idl
     page/Screen.idl
index c7c774d..9ab57bb 100644 (file)
@@ -1,5 +1,30 @@
 2010-06-02  Mikhail Naganov  <mnaganov@chromium.org>
 
+        Unreviewed, rolling out r60563.
+        http://trac.webkit.org/changeset/60563
+        https://bugs.webkit.org/show_bug.cgi?id=39646
+
+        windows build failed
+
+        * CMakeLists.txt:
+        * DerivedSources.cpp:
+        * DerivedSources.make:
+        * GNUmakefile.am:
+        * WebCore.gypi:
+        * WebCore.pri:
+        * WebCore.pro:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/js/JSConsoleCustom.cpp:
+        * bindings/v8/custom/V8ConsoleCustom.cpp:
+        * page/Console.h:
+        * page/Console.idl:
+        * page/MemoryInfo.cpp: Removed.
+        * page/MemoryInfo.h: Removed.
+        * page/MemoryInfo.idl: Removed.
+
+2010-06-02  Mikhail Naganov  <mnaganov@chromium.org>
+
         Reviewed by Yury Semikhatsky.
 
         Web Inspector: add Console API for retrieving memory stats
index c50531b..ae6b92e 100644 (file)
 #include "JSLocation.cpp"
 #include "JSMediaError.cpp"
 #include "JSMediaList.cpp"
-#include "JSMemoryInfo.cpp"
 #include "JSMessageChannel.cpp"
 #include "JSMessageEvent.cpp"
 #include "JSMessagePort.cpp"
index 999f055..703a3f8 100644 (file)
@@ -230,7 +230,6 @@ DOM_CLASSES = \
     Location \
     MediaError \
     MediaList \
-    MemoryInfo \
     MessageChannel \
     MessageEvent \
     MessagePort \
index 4dce62f..ea389ea 100644 (file)
@@ -296,7 +296,6 @@ IDL_BINDINGS += \
        WebCore/page/Geoposition.idl \
        WebCore/page/History.idl \
        WebCore/page/Location.idl \
-       WebCore/page/MemoryInfo.idl \
        WebCore/page/Navigator.idl \
        WebCore/page/PositionError.idl \
        WebCore/page/Screen.idl \
@@ -1497,8 +1496,6 @@ webcore_sources += \
        WebCore/page/Location.cpp \
        WebCore/page/Location.h \
        WebCore/page/MediaCanStartListener.h \
-       WebCore/page/MemoryInfo.cpp \
-       WebCore/page/MemoryInfo.h \
        WebCore/page/MouseEventWithHitTestResults.cpp \
        WebCore/page/MouseEventWithHitTestResults.h \
        WebCore/page/Navigator.cpp \
@@ -4045,7 +4042,6 @@ IDL_BINDINGS_GDOM += \
        WebCore/page/Geolocation.idl \
        WebCore/page/History.idl \
        WebCore/page/Location.idl \
-       WebCore/page/MemoryInfo.idl \
        WebCore/page/Navigator.idl \
        WebCore/page/Screen.idl \
        WebCore/page/WebKitPoint.idl \
index 293f785..80568a2 100644 (file)
             'page/Geoposition.idl',
             'page/History.idl',
             'page/Location.idl',
-            'page/MemoryInfo.idl',
             'page/Navigator.idl',
             'page/PositionError.idl',
             'page/Screen.idl',
             'page/History.h',
             'page/Location.cpp',
             'page/Location.h',
-            'page/MemoryInfo.cpp',
-            'page/MemoryInfo.h',
             'page/MouseEventWithHitTestResults.cpp',
             'page/MouseEventWithHitTestResults.h',
             'page/Navigator.cpp',
index d40c2aa..b17e906 100644 (file)
@@ -433,7 +433,6 @@ IDL_BINDINGS += \
     page/Geoposition.idl \
     page/History.idl \
     page/Location.idl \
-    page/MemoryInfo.idl \
     page/Navigator.idl \
     page/PositionError.idl \
     page/Screen.idl \
index 11a3dcb..342e843 100644 (file)
@@ -790,7 +790,6 @@ SOURCES += \
     page/GeolocationPositionCache.cpp \
     page/History.cpp \
     page/Location.cpp \
-    page/MemoryInfo.cpp \
     page/MouseEventWithHitTestResults.cpp \
     page/OriginAccessEntry.cpp \
     page/Page.cpp \
index ecdad46..5ecf73a 100644 (file)
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSMemoryInfo.cpp"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug_Internal|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug_Cairo|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release_Cairo|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug_All|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                       />
-                               </FileConfiguration>
-                       </File>
-                       <File
-                               RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSMemoryInfo.h"
-                               >
-                       </File>
-                       <File
                                RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSMessageChannel.cpp"\r
                                >\r
                                <FileConfiguration\r
index 4dd6d85..5845e8d 100644 (file)
                9FA37EFB1172FDA600C4CD55 /* JSScriptProfile.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FA37EF71172FD9300C4CD55 /* JSScriptProfile.h */; };
                9FA37EFC1172FDA600C4CD55 /* JSScriptProfileNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FA37EF81172FD9300C4CD55 /* JSScriptProfileNode.cpp */; };
                9FA37EFD1172FDA600C4CD55 /* JSScriptProfileNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FA37EF91172FD9300C4CD55 /* JSScriptProfileNode.h */; };
-               9FFE3E7A11B59C5D0037874E /* MemoryInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FFE3E7811B59C5D0037874E /* MemoryInfo.cpp */; };
-               9FFE3E7B11B59C5D0037874E /* MemoryInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FFE3E7911B59C5D0037874E /* MemoryInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               9FFE3EA511B5A4390037874E /* JSMemoryInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FFE3EA311B5A4390037874E /* JSMemoryInfo.cpp */; };
-               9FFE3EA611B5A4390037874E /* JSMemoryInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FFE3EA411B5A4390037874E /* JSMemoryInfo.h */; };
                A136A00C1134DBD200CC8D50 /* XMLHttpRequestProgressEventThrottle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A136A00A1134DBD200CC8D50 /* XMLHttpRequestProgressEventThrottle.cpp */; };
                A136A00D1134DBD200CC8D50 /* XMLHttpRequestProgressEventThrottle.h in Headers */ = {isa = PBXBuildFile; fileRef = A136A00B1134DBD200CC8D50 /* XMLHttpRequestProgressEventThrottle.h */; };
                A17C81220F2A5CF7005DAAEB /* HTMLElementFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A17C81200F2A5CF7005DAAEB /* HTMLElementFactory.cpp */; };
                9FA37EF71172FD9300C4CD55 /* JSScriptProfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSScriptProfile.h; sourceTree = "<group>"; };
                9FA37EF81172FD9300C4CD55 /* JSScriptProfileNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSScriptProfileNode.cpp; sourceTree = "<group>"; };
                9FA37EF91172FD9300C4CD55 /* JSScriptProfileNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSScriptProfileNode.h; sourceTree = "<group>"; };
-               9FFE3E7811B59C5D0037874E /* MemoryInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MemoryInfo.cpp; sourceTree = "<group>"; };
-               9FFE3E7911B59C5D0037874E /* MemoryInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemoryInfo.h; sourceTree = "<group>"; };
-               9FFE3E7C11B59C6E0037874E /* MemoryInfo.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MemoryInfo.idl; sourceTree = "<group>"; };
-               9FFE3EA311B5A4390037874E /* JSMemoryInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMemoryInfo.cpp; sourceTree = "<group>"; };
-               9FFE3EA411B5A4390037874E /* JSMemoryInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMemoryInfo.h; sourceTree = "<group>"; };
                A136A00A1134DBD200CC8D50 /* XMLHttpRequestProgressEventThrottle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XMLHttpRequestProgressEventThrottle.cpp; sourceTree = "<group>"; };
                A136A00B1134DBD200CC8D50 /* XMLHttpRequestProgressEventThrottle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XMLHttpRequestProgressEventThrottle.h; sourceTree = "<group>"; };
                A17C81200F2A5CF7005DAAEB /* HTMLElementFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLElementFactory.cpp; sourceTree = "<group>"; };
                65BF02180974806300C43196 /* page */ = {
                        isa = PBXGroup;
                        children = (
-                               9FFE3E7C11B59C6E0037874E /* MemoryInfo.idl */,
-                               9FFE3E7811B59C5D0037874E /* MemoryInfo.cpp */,
-                               9FFE3E7911B59C5D0037874E /* MemoryInfo.h */,
                                316FE1060E6E1D8400BF6088 /* animation */,
                                93C09A820B064F05005ABD4D /* mac */,
                                8538F0000AD71770006A81D1 /* AbstractView.idl */,
                BC9854430CD3D9D000069BC1 /* Window */ = {
                        isa = PBXGroup;
                        children = (
-                               9FFE3EA311B5A4390037874E /* JSMemoryInfo.cpp */,
-                               9FFE3EA411B5A4390037874E /* JSMemoryInfo.h */,
                                BC124EFD0C26447A009E2349 /* JSBarInfo.cpp */,
                                BC124EFE0C26447A009E2349 /* JSBarInfo.h */,
                                BC98543B0CD3D98B00069BC1 /* JSConsole.cpp */,
                                C51DA9A911AEF2C1009799C5 /* IDBIndexRequest.h in Headers */,
                                C5BBC9D111AEF838007C2BFE /* JSIDBIndexRequest.h in Headers */,
                                4F3289B611A42AAB005ABE7E /* InspectorValues.h in Headers */,
-                               9FFE3E7B11B59C5D0037874E /* MemoryInfo.h in Headers */,
-                               9FFE3EA611B5A4390037874E /* JSMemoryInfo.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                C51DA9A811AEF2C1009799C5 /* IDBIndexRequest.cpp in Sources */,
                                C5BBC9D011AEF838007C2BFE /* JSIDBIndexRequest.cpp in Sources */,
                                4F3289B511A42AAB005ABE7E /* InspectorValues.cpp in Sources */,
-                               9FFE3E7A11B59C5D0037874E /* MemoryInfo.cpp in Sources */,
-                               9FFE3EA511B5A4390037874E /* JSMemoryInfo.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
index b9b407c..3ad34a3 100644 (file)
@@ -28,9 +28,7 @@
 #include "JSConsole.h"
 
 #include "Console.h"
-#include "JSMemoryInfo.h"
 #include "JSScriptProfile.h"
-#include "MemoryInfo.h"
 #include "ScriptCallStack.h"
 #include "ScriptProfile.h"
 #include <runtime/JSArray.h>
@@ -57,9 +55,4 @@ JSValue JSConsole::profiles(ExecState* exec) const
 
 #endif
 
-JSValue JSConsole::memory(ExecState* exec) const
-{
-    return toJS(exec, MemoryInfo::create());
-}
-
 } // namespace WebCore
index 0529558..4cc6ac2 100644 (file)
 #include "V8Console.h"
 
 #include "Console.h"
-#include "MemoryInfo.h"
 #include "ScriptProfile.h"
 #include "V8Binding.h"
-#include "V8MemoryInfo.h"
 #include "V8Proxy.h"
 #include "V8ScriptProfile.h"
 
@@ -51,10 +49,4 @@ v8::Handle<v8::Value> V8Console::profilesAccessorGetter(v8::Local<v8::String>, c
     return v8::Array::New(0);
 }
 
-v8::Handle<v8::Value> V8Console::memoryAccessorGetter(v8::Local<v8::String>, const v8::AccessorInfo&)
-{
-    INC_STATS("DOM.Console.memoryAccessorGetter");
-    return toV8(MemoryInfo::create());
-}
-
 } // namespace WebCore
index 04e743e..18e311f 100644 (file)
@@ -43,7 +43,6 @@ typedef Vector<RefPtr<ScriptProfile> > ProfilesArray;
 #endif
 
 class Frame;
-class MemoryInfo;
 class Page;
 class String;
 class ScriptCallStack;
index 1506210..9a7cdc0 100644 (file)
@@ -60,8 +60,6 @@ module window {
         [CustomArgumentHandling] void group();
         [CustomArgumentHandling] void groupCollapsed();
         void groupEnd();
-
-        readonly attribute [CustomGetter] MemoryInfo memory;
     };
 
 }
diff --git a/WebCore/page/MemoryInfo.cpp b/WebCore/page/MemoryInfo.cpp
deleted file mode 100644 (file)
index 010a19c..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2010 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 "MemoryInfo.h"
-
-#include "ScriptGCEvent.h"
-
-namespace WebCore {
-
-MemoryInfo::MemoryInfo()
-        : m_totalJSHeapSize(0),
-          m_usedJSHeapSize(0)
-{
-#if ENABLE(INSPECTOR)
-    ScriptGCEvent::getHeapSize(m_usedJSHeapSize, m_totalJSHeapSize);
-#endif
-}
-
-} // namespace WebCore
diff --git a/WebCore/page/MemoryInfo.h b/WebCore/page/MemoryInfo.h
deleted file mode 100644 (file)
index e9e0fa5..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-#ifndef MemoryInfo_h
-#define MemoryInfo_h
-
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
-class MemoryInfo : public RefCounted<MemoryInfo> {
-public:
-    static PassRefPtr<MemoryInfo> create() { return adoptRef(new MemoryInfo()); }
-
-    size_t totalJSHeapSize() const { return m_totalJSHeapSize; }
-    size_t usedJSHeapSize() const { return m_usedJSHeapSize; }
-
-private:
-    MemoryInfo();
-
-    size_t m_totalJSHeapSize;
-    size_t m_usedJSHeapSize;
-};
-
-} // namespace WebCore
-
-#endif // MemoryInfo_h
diff --git a/WebCore/page/MemoryInfo.idl b/WebCore/page/MemoryInfo.idl
deleted file mode 100644 (file)
index 59b0081..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-module window {
-
-    interface [OmitConstructor] MemoryInfo {
-
-        readonly attribute unsigned long totalJSHeapSize;
-        readonly attribute unsigned long usedJSHeapSize;
-
-    };
-
-}