From 43a80137ae544609ee8dd33b67ed071a20395019 Mon Sep 17 00:00:00 2001 From: "zandobersek@gmail.com" Date: Wed, 5 Jun 2013 07:08:40 +0000 Subject: [PATCH] Move MemoryInfo under window.internals https://bugs.webkit.org/show_bug.cgi?id=117197 Reviewed by Ryosuke Niwa. .: * Source/autotools/symbols.filter: Export the required symbol. PerformanceTests: * resources/runner.js: Remove the setMemoryEnabled call, it's not required anymore as the memory info is now accessed through window.internals and doesn't need the setting to be enabled to work. Source/WebCore: The MemoryInfo interface is not a subject of any specification and should not be exposed to the Web. It's still used by the performance tests so it is moved under the testing internals, accessible through window.internals.memoryInfo. The jsHeapSizeLimit attribute is removed from the MemoryInfo interface as that value was only usable when using the V8 bindings which are not supported anymore. A small fast/harness test is also provided to check that the MemoryInfo object is accessible through window.internals. Test: fast/harness/memoryinfo-object.html * CMakeLists.txt: * DerivedSources.cpp: * DerivedSources.make: * DerivedSources.pri: * GNUmakefile.list.am: * Target.pri: * UseJSC.cmake: * WebCore.exp.in: * WebCore.order: * WebCore.vcxproj/WebCore.vcxproj: * WebCore.vcxproj/WebCore.vcxproj.filters: * WebCore.vcxproj/WebCoreTestSupport.vcxproj: * WebCore.vcxproj/WebCoreTestSupport.vcxproj.filters: * WebCore.xcodeproj/project.pbxproj: * bindings/gobject/GNUmakefile.am: Remove the GObject bindings targets for MemoryInfo. * bindings/js/JSBindingsAllInOne.cpp: Remove the JSMemoryInfo.h and MemoryInfo.h inclusion. * bindings/js/JSMemoryInfoCustom.cpp: Removed. * bindings/js/ScriptGCEvent.cpp: Remove the ENABLE(INSPECTOR) guards. (WebCore::ScriptGCEvent::getHeapSize): Remove the jsHeapSizeLimit assignment. * bindings/js/ScriptGCEvent.h: Remove the ENABLE(INSPECTOR) guards. (WebCore::HeapInfo::HeapInfo): Remove the jsHeapSizeLimit member. * page/Console.cpp: Remove the Console::memory method. * page/Console.h: Ditto. * page/Console.idl: Remove the window.console.memory attribute. * page/MemoryInfo.cpp: Removed. * page/Performance.cpp: Remove the Performance::memory method. * page/Performance.h: Ditto. * page/Performance.idl: Remove the window.performance.memory attribute. * testing/Internals.cpp: (WebCore::Internals::memoryInfo): Return a MemoryInfo object upon invoking. * testing/Internals.h: Declare the Internals::memoryInfo method. * testing/Internals.idl: Expose the window.internals.memoryInfo operation. * testing/MemoryInfo.h: Renamed from Source/WebCore/page/MemoryInfo.h. (WebCore::MemoryInfo::create): Return a new RefPtr-wrapped MemoryInfo object. (WebCore::MemoryInfo::usedJSHeapSize): Return the value of the equally-named HeapInfo member. (WebCore::MemoryInfo::totalJSHeapSize): Ditto. (WebCore::MemoryInfo::MemoryInfo): Acquire the current heap info upon construction. * testing/MemoryInfo.idl: Renamed from Source/WebCore/page/MemoryInfo.idl. The jsHeapSizeLimit attribute is removed. Tools: * GNUmakefile.am: Add the testing/MemoryInfo.(h|idl) files and the generated targets to the Automake build * Scripts/webkitperl/filter-build-webkit_unittest/shouldIgnoreLine_unittests.pl: List the testing/MemoryInfo.idl file instead of page/MemoryInfo.idl. LayoutTests: Remove window.performance.memory property listings from the baselines, the object was moved under window.internals. The latter is tested throug the new fast/harness test. * fast/dom/Window/window-properties-performance-expected.txt: * fast/harness/memoryinfo-object-expected.txt: Added. * fast/harness/memoryinfo-object.html: Added. * platform/efl/fast/dom/Window/window-properties-performance-expected.txt: * platform/gtk/fast/dom/Window/window-properties-performance-expected.txt: * platform/qt/fast/dom/Window/window-properties-performance-expected.txt: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@151199 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- ChangeLog | 9 ++ LayoutTests/ChangeLog | 17 ++ ...window-properties-performance-expected.txt | 4 - .../harness/memoryinfo-object-expected.txt | 5 + .../fast/harness/memoryinfo-object.html | 16 ++ ...window-properties-performance-expected.txt | 4 - ...window-properties-performance-expected.txt | 4 - ...window-properties-performance-expected.txt | 4 - PerformanceTests/ChangeLog | 10 ++ PerformanceTests/resources/runner.js | 6 +- Source/WebCore/CMakeLists.txt | 3 +- Source/WebCore/ChangeLog | 57 +++++++ Source/WebCore/DerivedSources.cpp | 1 - Source/WebCore/DerivedSources.make | 2 +- Source/WebCore/DerivedSources.pri | 2 +- Source/WebCore/GNUmakefile.list.am | 7 +- Source/WebCore/Target.pri | 3 +- Source/WebCore/UseJSC.cmake | 1 - Source/WebCore/WebCore.exp.in | 1 + Source/WebCore/WebCore.order | 23 --- .../WebCore/WebCore.vcxproj/WebCore.vcxproj | 17 -- .../WebCore.vcxproj/WebCore.vcxproj.filters | 9 -- .../WebCoreTestSupport.vcxproj | 34 ++++ .../WebCoreTestSupport.vcxproj.filters | 9 ++ .../WebCore/WebCore.xcodeproj/project.pbxproj | 34 ++-- .../WebCore/bindings/gobject/GNUmakefile.am | 3 - .../bindings/js/JSBindingsAllInOne.cpp | 2 - .../bindings/js/JSMemoryInfoCustom.cpp | 44 ----- Source/WebCore/bindings/js/ScriptGCEvent.cpp | 5 - Source/WebCore/bindings/js/ScriptGCEvent.h | 6 - Source/WebCore/page/Console.cpp | 8 - Source/WebCore/page/Console.h | 3 - Source/WebCore/page/Console.idl | 2 - Source/WebCore/page/MemoryInfo.cpp | 152 ------------------ Source/WebCore/page/Performance.cpp | 6 - Source/WebCore/page/Performance.h | 2 - Source/WebCore/page/Performance.idl | 1 - Source/WebCore/testing/Internals.cpp | 6 + Source/WebCore/testing/Internals.h | 2 + Source/WebCore/testing/Internals.idl | 1 + Source/WebCore/{page => testing}/MemoryInfo.h | 14 +- .../WebCore/{page => testing}/MemoryInfo.idl | 6 +- Source/autotools/symbols.filter | 1 + Tools/ChangeLog | 12 ++ Tools/GNUmakefile.am | 3 + .../shouldIgnoreLine_unittests.pl | 2 +- 46 files changed, 209 insertions(+), 354 deletions(-) create mode 100644 LayoutTests/fast/harness/memoryinfo-object-expected.txt create mode 100644 LayoutTests/fast/harness/memoryinfo-object.html delete mode 100644 Source/WebCore/bindings/js/JSMemoryInfoCustom.cpp delete mode 100644 Source/WebCore/page/MemoryInfo.cpp rename Source/WebCore/{page => testing}/MemoryInfo.h (88%) rename Source/WebCore/{page => testing}/MemoryInfo.idl (96%) diff --git a/ChangeLog b/ChangeLog index a3cd70c47c3..a1ce3058f20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2013-06-05 Zan Dobersek + + Move MemoryInfo under window.internals + https://bugs.webkit.org/show_bug.cgi?id=117197 + + Reviewed by Ryosuke Niwa. + + * Source/autotools/symbols.filter: Export the required symbol. + 2013-06-04 Christophe Dumez Automatically generate WorkerContext constructor attributes diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index 59faf90b816..f8edab4b3df 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,3 +1,20 @@ +2013-06-05 Zan Dobersek + + Move MemoryInfo under window.internals + https://bugs.webkit.org/show_bug.cgi?id=117197 + + Reviewed by Ryosuke Niwa. + + Remove window.performance.memory property listings from the baselines, the object was moved + under window.internals. The latter is tested throug the new fast/harness test. + + * fast/dom/Window/window-properties-performance-expected.txt: + * fast/harness/memoryinfo-object-expected.txt: Added. + * fast/harness/memoryinfo-object.html: Added. + * platform/efl/fast/dom/Window/window-properties-performance-expected.txt: + * platform/gtk/fast/dom/Window/window-properties-performance-expected.txt: + * platform/qt/fast/dom/Window/window-properties-performance-expected.txt: + 2013-06-04 Gyuyoung Kim Unreviewed, EFL Gardening. Move mozilla-focus-blur.html to efl-wk2, because it is only failing on EFL WK2. diff --git a/LayoutTests/fast/dom/Window/window-properties-performance-expected.txt b/LayoutTests/fast/dom/Window/window-properties-performance-expected.txt index 93d82ba8caf..666ce305446 100644 --- a/LayoutTests/fast/dom/Window/window-properties-performance-expected.txt +++ b/LayoutTests/fast/dom/Window/window-properties-performance-expected.txt @@ -1,10 +1,6 @@ This test dumps all of the properties that are reachable from the window.performance object, along with their types. window.performance [object Performance] -window.performance.memory [object MemoryInfo] -window.performance.memory.jsHeapSizeLimit [number] -window.performance.memory.totalJSHeapSize [number] -window.performance.memory.usedJSHeapSize [number] window.performance.navigation [object PerformanceNavigation] window.performance.navigation.TYPE_BACK_FORWARD [number] window.performance.navigation.TYPE_NAVIGATE [number] diff --git a/LayoutTests/fast/harness/memoryinfo-object-expected.txt b/LayoutTests/fast/harness/memoryinfo-object-expected.txt new file mode 100644 index 00000000000..8f267a05cd0 --- /dev/null +++ b/LayoutTests/fast/harness/memoryinfo-object-expected.txt @@ -0,0 +1,5 @@ +PASS [object Internals] is defined. +PASS [object MemoryInfo] is defined. +PASS stats.usedJSHeapSize is >= 0 +PASS stats.totalJSHeapSize is >= 0 + diff --git a/LayoutTests/fast/harness/memoryinfo-object.html b/LayoutTests/fast/harness/memoryinfo-object.html new file mode 100644 index 00000000000..924996659d2 --- /dev/null +++ b/LayoutTests/fast/harness/memoryinfo-object.html @@ -0,0 +1,16 @@ + + + + + + + + + diff --git a/LayoutTests/platform/efl/fast/dom/Window/window-properties-performance-expected.txt b/LayoutTests/platform/efl/fast/dom/Window/window-properties-performance-expected.txt index 76df220de2b..666ce305446 100644 --- a/LayoutTests/platform/efl/fast/dom/Window/window-properties-performance-expected.txt +++ b/LayoutTests/platform/efl/fast/dom/Window/window-properties-performance-expected.txt @@ -1,10 +1,6 @@ This test dumps all of the properties that are reachable from the window.performance object, along with their types. window.performance [object Performance] -window.performance.memory [object MemoryInfo] -window.performance.memory.jsHeapSizeLimit [undefined] -window.performance.memory.totalJSHeapSize [number] -window.performance.memory.usedJSHeapSize [number] window.performance.navigation [object PerformanceNavigation] window.performance.navigation.TYPE_BACK_FORWARD [number] window.performance.navigation.TYPE_NAVIGATE [number] diff --git a/LayoutTests/platform/gtk/fast/dom/Window/window-properties-performance-expected.txt b/LayoutTests/platform/gtk/fast/dom/Window/window-properties-performance-expected.txt index 3b5ab9a89e7..504763232a4 100644 --- a/LayoutTests/platform/gtk/fast/dom/Window/window-properties-performance-expected.txt +++ b/LayoutTests/platform/gtk/fast/dom/Window/window-properties-performance-expected.txt @@ -1,10 +1,6 @@ This test dumps all of the properties that are reachable from the window.performance object, along with their types. window.performance [object Performance] -window.performance.memory [object MemoryInfo] -window.performance.memory.jsHeapSizeLimit [undefined] -window.performance.memory.totalJSHeapSize [number] -window.performance.memory.usedJSHeapSize [number] window.performance.navigation [object PerformanceNavigation] window.performance.navigation.TYPE_BACK_FORWARD [number] window.performance.navigation.TYPE_NAVIGATE [number] diff --git a/LayoutTests/platform/qt/fast/dom/Window/window-properties-performance-expected.txt b/LayoutTests/platform/qt/fast/dom/Window/window-properties-performance-expected.txt index 76df220de2b..666ce305446 100644 --- a/LayoutTests/platform/qt/fast/dom/Window/window-properties-performance-expected.txt +++ b/LayoutTests/platform/qt/fast/dom/Window/window-properties-performance-expected.txt @@ -1,10 +1,6 @@ This test dumps all of the properties that are reachable from the window.performance object, along with their types. window.performance [object Performance] -window.performance.memory [object MemoryInfo] -window.performance.memory.jsHeapSizeLimit [undefined] -window.performance.memory.totalJSHeapSize [number] -window.performance.memory.usedJSHeapSize [number] window.performance.navigation [object PerformanceNavigation] window.performance.navigation.TYPE_BACK_FORWARD [number] window.performance.navigation.TYPE_NAVIGATE [number] diff --git a/PerformanceTests/ChangeLog b/PerformanceTests/ChangeLog index 950e89b1a09..71b162a87d8 100644 --- a/PerformanceTests/ChangeLog +++ b/PerformanceTests/ChangeLog @@ -1,3 +1,13 @@ +2013-06-05 Zan Dobersek + + Move MemoryInfo under window.internals + https://bugs.webkit.org/show_bug.cgi?id=117197 + + Reviewed by Ryosuke Niwa. + + * resources/runner.js: Remove the setMemoryEnabled call, it's not required anymore as the memory + info is now accessed through window.internals and doesn't need the setting to be enabled to work. + 2013-05-30 Ryosuke Niwa Web Inspector: tests in PerformanceTests/inspector/ are timing out diff --git a/PerformanceTests/resources/runner.js b/PerformanceTests/resources/runner.js index 3a6c7c0c7ab..576f1d13e8d 100755 --- a/PerformanceTests/resources/runner.js +++ b/PerformanceTests/resources/runner.js @@ -1,9 +1,5 @@ // There are tests for computeStatistics() located in LayoutTests/fast/harness/perftests -// We need access to console.memory for the memory measurements -if (window.internals) - internals.settings.setMemoryInfoEnabled(true); - if (window.testRunner) { testRunner.waitUntilDone(); testRunner.dumpAsText(); @@ -106,7 +102,7 @@ if (window.testRunner) { } function getUsedJSHeap() { - return console.memory.usedJSHeapSize; + return window.internals.memoryInfo().usedJSHeapSize; } PerfTestRunner.gc = function () { diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt index 7bd8085647c..642c6cf9855 100644 --- a/Source/WebCore/CMakeLists.txt +++ b/Source/WebCore/CMakeLists.txt @@ -562,7 +562,6 @@ set(WebCore_IDL_FILES page/EventSource.idl page/History.idl page/Location.idl - page/MemoryInfo.idl page/Navigator.idl page/Performance.idl page/PerformanceEntry.idl @@ -1747,7 +1746,6 @@ set(WebCore_SOURCES page/GestureTapHighlighter.cpp page/History.cpp page/Location.cpp - page/MemoryInfo.cpp page/MouseEventWithHitTestResults.cpp page/Navigator.cpp page/NavigatorBase.cpp @@ -2925,6 +2923,7 @@ set(WebCoreTestSupport_IDL_FILES testing/Internals.idl testing/InternalSettings.idl testing/MallocStatistics.idl + testing/MemoryInfo.idl testing/TypeConversions.idl ) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index be8be77222d..be3c21ed910 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,60 @@ +2013-06-05 Zan Dobersek + + Move MemoryInfo under window.internals + https://bugs.webkit.org/show_bug.cgi?id=117197 + + Reviewed by Ryosuke Niwa. + + The MemoryInfo interface is not a subject of any specification and should not be exposed + to the Web. It's still used by the performance tests so it is moved under the testing + internals, accessible through window.internals.memoryInfo. + + The jsHeapSizeLimit attribute is removed from the MemoryInfo interface as that value was + only usable when using the V8 bindings which are not supported anymore. A small fast/harness + test is also provided to check that the MemoryInfo object is accessible through window.internals. + + Test: fast/harness/memoryinfo-object.html + + * CMakeLists.txt: + * DerivedSources.cpp: + * DerivedSources.make: + * DerivedSources.pri: + * GNUmakefile.list.am: + * Target.pri: + * UseJSC.cmake: + * WebCore.exp.in: + * WebCore.order: + * WebCore.vcxproj/WebCore.vcxproj: + * WebCore.vcxproj/WebCore.vcxproj.filters: + * WebCore.vcxproj/WebCoreTestSupport.vcxproj: + * WebCore.vcxproj/WebCoreTestSupport.vcxproj.filters: + * WebCore.xcodeproj/project.pbxproj: + * bindings/gobject/GNUmakefile.am: Remove the GObject bindings targets for MemoryInfo. + * bindings/js/JSBindingsAllInOne.cpp: Remove the JSMemoryInfo.h and MemoryInfo.h inclusion. + * bindings/js/JSMemoryInfoCustom.cpp: Removed. + * bindings/js/ScriptGCEvent.cpp: Remove the ENABLE(INSPECTOR) guards. + (WebCore::ScriptGCEvent::getHeapSize): Remove the jsHeapSizeLimit assignment. + * bindings/js/ScriptGCEvent.h: Remove the ENABLE(INSPECTOR) guards. + (WebCore::HeapInfo::HeapInfo): Remove the jsHeapSizeLimit member. + * page/Console.cpp: Remove the Console::memory method. + * page/Console.h: Ditto. + * page/Console.idl: Remove the window.console.memory attribute. + * page/MemoryInfo.cpp: Removed. + * page/Performance.cpp: Remove the Performance::memory method. + * page/Performance.h: Ditto. + * page/Performance.idl: Remove the window.performance.memory attribute. + * testing/Internals.cpp: + (WebCore::Internals::memoryInfo): Return a MemoryInfo object upon invoking. + * testing/Internals.h: Declare the Internals::memoryInfo method. + * testing/Internals.idl: Expose the window.internals.memoryInfo operation. + * testing/MemoryInfo.h: Renamed from Source/WebCore/page/MemoryInfo.h. + (WebCore::MemoryInfo::create): Return a new RefPtr-wrapped MemoryInfo object. + (WebCore::MemoryInfo::usedJSHeapSize): Return the value of the equally-named HeapInfo member. + (WebCore::MemoryInfo::totalJSHeapSize): Ditto. + (WebCore::MemoryInfo::MemoryInfo): Acquire the current heap info upon construction. + * testing/MemoryInfo.idl: Renamed from Source/WebCore/page/MemoryInfo.idl. + The jsHeapSizeLimit attribute is removed. + 2013-06-04 Peter Gal [curl] Headers should be parsed as utf8 if possible diff --git a/Source/WebCore/DerivedSources.cpp b/Source/WebCore/DerivedSources.cpp index 7ebc70f7c3a..85f549772e3 100644 --- a/Source/WebCore/DerivedSources.cpp +++ b/Source/WebCore/DerivedSources.cpp @@ -252,7 +252,6 @@ #if ENABLE(MEDIA_SOURCE) #include "JSMediaSource.cpp" #endif -#include "JSMemoryInfo.cpp" #include "JSMessageChannel.cpp" #include "JSMessageEvent.cpp" #include "JSMessagePort.cpp" diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make index 2d7ae96994d..8f998aaec27 100644 --- a/Source/WebCore/DerivedSources.make +++ b/Source/WebCore/DerivedSources.make @@ -453,7 +453,6 @@ BINDING_IDLS = \ $(WebCore)/page/EventSource.idl \ $(WebCore)/page/History.idl \ $(WebCore)/page/Location.idl \ - $(WebCore)/page/MemoryInfo.idl \ $(WebCore)/page/Navigator.idl \ $(WebCore)/page/Performance.idl \ $(WebCore)/page/PerformanceNavigation.idl \ @@ -626,6 +625,7 @@ BINDING_IDLS = \ $(WebCore)/testing/Internals.idl \ $(WebCore)/testing/InternalSettings.idl \ $(WebCore)/testing/MallocStatistics.idl \ + $(WebCore)/testing/MemoryInfo.idl \ $(WebCore)/testing/TypeConversions.idl \ $(WebCore)/workers/AbstractWorker.idl \ $(WebCore)/workers/DedicatedWorkerContext.idl \ diff --git a/Source/WebCore/DerivedSources.pri b/Source/WebCore/DerivedSources.pri index 0fd20457a5d..13b44b836ba 100644 --- a/Source/WebCore/DerivedSources.pri +++ b/Source/WebCore/DerivedSources.pri @@ -450,7 +450,6 @@ IDL_BINDINGS += \ $$PWD/page/EventSource.idl \ $$PWD/page/History.idl \ $$PWD/page/Location.idl \ - $$PWD/page/MemoryInfo.idl \ $$PWD/page/Navigator.idl \ $$PWD/page/Performance.idl \ $$PWD/page/PerformanceEntry.idl \ @@ -473,6 +472,7 @@ IDL_BINDINGS += \ $$PWD/testing/Internals.idl \ $$PWD/testing/InternalSettings.idl \ $$PWD/testing/MallocStatistics.idl \ + $$PWD/testing/MemoryInfo.idl \ $$PWD/testing/TypeConversions.idl \ $$PWD/workers/AbstractWorker.idl \ $$PWD/workers/DedicatedWorkerContext.idl \ diff --git a/Source/WebCore/GNUmakefile.list.am b/Source/WebCore/GNUmakefile.list.am index ebc845a237e..32738b18296 100644 --- a/Source/WebCore/GNUmakefile.list.am +++ b/Source/WebCore/GNUmakefile.list.am @@ -530,8 +530,6 @@ webcore_built_sources += \ DerivedSources/WebCore/JSMediaStreamTrackEvent.h \ DerivedSources/WebCore/JSMediaQueryList.cpp \ DerivedSources/WebCore/JSMediaQueryList.h \ - DerivedSources/WebCore/JSMemoryInfo.cpp \ - DerivedSources/WebCore/JSMemoryInfo.h \ DerivedSources/WebCore/JSMessageChannel.cpp \ DerivedSources/WebCore/JSMessageChannel.h \ DerivedSources/WebCore/JSMessageEvent.cpp \ @@ -1623,7 +1621,6 @@ dom_binding_idls += \ $(WebCore)/page/EventSource.idl \ $(WebCore)/page/History.idl \ $(WebCore)/page/Location.idl \ - $(WebCore)/page/MemoryInfo.idl \ $(WebCore)/page/Navigator.idl \ $(WebCore)/page/Performance.idl \ $(WebCore)/page/PerformanceEntry.idl \ @@ -1792,6 +1789,7 @@ dom_binding_idls += \ $(WebCore)/testing/Internals.idl \ $(WebCore)/testing/InternalSettings.idl \ $(WebCore)/testing/MallocStatistics.idl \ + $(WebCore)/testing/MemoryInfo.idl \ $(WebCore)/testing/TypeConversions.idl \ $(WebCore)/workers/AbstractWorker.idl \ $(WebCore)/workers/DedicatedWorkerContext.idl \ @@ -2453,7 +2451,6 @@ webcore_sources += \ Source/WebCore/bindings/js/JSMainThreadExecState.h \ Source/WebCore/bindings/js/JSMediaListCustom.h \ Source/WebCore/bindings/js/JSMediaListCustom.cpp \ - Source/WebCore/bindings/js/JSMemoryInfoCustom.cpp \ Source/WebCore/bindings/js/JSMessageChannelCustom.cpp \ Source/WebCore/bindings/js/JSMessageEventCustom.cpp \ Source/WebCore/bindings/js/JSMessagePortCustom.cpp \ @@ -4239,8 +4236,6 @@ webcore_sources += \ Source/WebCore/page/Location.cpp \ Source/WebCore/page/Location.h \ Source/WebCore/page/MediaCanStartListener.h \ - Source/WebCore/page/MemoryInfo.cpp \ - Source/WebCore/page/MemoryInfo.h \ Source/WebCore/page/MouseEventWithHitTestResults.cpp \ Source/WebCore/page/MouseEventWithHitTestResults.h \ Source/WebCore/page/Navigator.cpp \ diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri index 799d0a5505f..0b4a4fd9d06 100644 --- a/Source/WebCore/Target.pri +++ b/Source/WebCore/Target.pri @@ -155,7 +155,6 @@ SOURCES += \ bindings/js/JSLocationCustom.cpp \ bindings/js/JSMainThreadExecState.cpp \ bindings/js/JSMediaListCustom.cpp \ - bindings/js/JSMemoryInfoCustom.cpp \ bindings/js/JSMessageChannelCustom.cpp \ bindings/js/JSMessageEventCustom.cpp \ bindings/js/JSMessagePortCustom.cpp \ @@ -925,7 +924,6 @@ SOURCES += \ page/GroupSettings.cpp \ page/History.cpp \ page/Location.cpp \ - page/MemoryInfo.cpp \ page/MouseEventWithHitTestResults.cpp \ page/Navigator.cpp \ page/NavigatorBase.cpp \ @@ -2814,6 +2812,7 @@ HEADERS += \ testing/Internals.h \ testing/InternalSettings.h \ testing/MallocStatistics.h \ + testing/MemoryInfo.h \ testing/TypeConversions.h \ workers/AbstractWorker.h \ workers/DedicatedWorkerContext.h \ diff --git a/Source/WebCore/UseJSC.cmake b/Source/WebCore/UseJSC.cmake index 07fdb6f59ca..e4a7510c006 100644 --- a/Source/WebCore/UseJSC.cmake +++ b/Source/WebCore/UseJSC.cmake @@ -106,7 +106,6 @@ list(APPEND WebCore_SOURCES bindings/js/JSLocationCustom.cpp bindings/js/JSMainThreadExecState.cpp bindings/js/JSMediaListCustom.cpp - bindings/js/JSMemoryInfoCustom.cpp bindings/js/JSMessageChannelCustom.cpp bindings/js/JSMessageEventCustom.cpp bindings/js/JSMessagePortCustom.cpp diff --git a/Source/WebCore/WebCore.exp.in b/Source/WebCore/WebCore.exp.in index 172c37d1253..f50ae4ae741 100644 --- a/Source/WebCore/WebCore.exp.in +++ b/Source/WebCore/WebCore.exp.in @@ -1273,6 +1273,7 @@ __ZN7WebCore9pageCacheEv __ZN7WebCore9plainTextEPKNS_5RangeENS_20TextIteratorBehaviorEb __ZN7WebCore9toElementEN3JSC7JSValueE __ZN7WebCore9unionRectERKN3WTF6VectorINS_9FloatRectELm0ENS0_15CrashOnOverflowEEE +__ZN7WebCore13ScriptGCEvent11getHeapSizeERNS_8HeapInfoE __ZNK3JSC8Bindings10RootObject12globalObjectEv __ZNK3WTF6String14createCFStringEv __ZNK7WebCore10Credential11hasPasswordEv diff --git a/Source/WebCore/WebCore.order b/Source/WebCore/WebCore.order index 7fa318435ee..4a4ec66efb9 100644 --- a/Source/WebCore/WebCore.order +++ b/Source/WebCore/WebCore.order @@ -23008,11 +23008,6 @@ __ZN7WebCore17jsConsoleProfilesEPN3JSC9ExecStateENS0_7JSValueERKNS0_10Identifier __ZNK7WebCore9JSConsole8profilesEPN3JSC9ExecStateE __ZN7WebCore15jsConsoleMemoryEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE __ZNK7WebCore7Console6memoryEv -__ZN7WebCore10MemoryInfoC1EPNS_5FrameE -__ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_10MemoryInfoE -__ZN7WebCore13createWrapperINS_12JSMemoryInfoENS_10MemoryInfoEEEPNS_12JSDOMWrapperEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPT0_ -__ZN7WebCore15getDOMStructureINS_12JSMemoryInfoEEEPN3JSC9StructureEPNS2_9ExecStateEPNS_17JSDOMGlobalObjectE -__ZN7WebCore12JSMemoryInfo15createPrototypeEPN3JSC9ExecStateEPNS1_14JSGlobalObjectE __ZN7WebCore22JSDOMWindowConstructor18getOwnPropertySlotEPN3JSC9ExecStateERKNS1_10IdentifierERNS1_12PropertySlotE __ZN3JSC18getStaticValueSlotIN7WebCore22JSDOMWindowConstructorENS1_12JSDOMWrapperEEEbPNS_9ExecStateEPKNS_9HashTableEPT_RKNS_10IdentifierERNS_12PropertySlotE __ZN7WebCore24jsCSSStyleSheetOwnerRuleEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE @@ -23082,12 +23077,6 @@ __ZN7WebCore22jsDOMPluginArrayLengthEPN3JSC9ExecStateENS0_7JSValueERKNS0_10Ident __ZN7WebCore27jsDOMPluginArrayConstructorEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE __ZN7WebCore23JSStyleMediaConstructor18getOwnPropertySlotEPN3JSC9ExecStateERKNS1_10IdentifierERNS1_12PropertySlotE __ZN3JSC18getStaticValueSlotIN7WebCore23JSStyleMediaConstructorENS1_12JSDOMWrapperEEEbPNS_9ExecStateEPKNS_9HashTableEPT_RKNS_10IdentifierERNS_12PropertySlotE -__ZN7WebCore12JSMemoryInfo18getOwnPropertySlotEPN3JSC9ExecStateERKNS1_10IdentifierERNS1_12PropertySlotE -__ZN3JSC18getStaticValueSlotIN7WebCore12JSMemoryInfoENS1_12JSDOMWrapperEEEbPNS_9ExecStateEPKNS_9HashTableEPT_RKNS_10IdentifierERNS_12PropertySlotE -__ZN7WebCore27jsMemoryInfoJsHeapSizeLimitEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE -__ZNK7WebCore12JSMemoryInfo15jsHeapSizeLimitEPN3JSC9ExecStateE -__ZN7WebCore26jsMemoryInfoUsedJSHeapSizeEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE -__ZN7WebCore27jsMemoryInfoTotalJSHeapSizeEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE __ZN7WebCore24jsCSSRuleListConstructorEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE __ZN7WebCore22jsMediaListConstructorEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE __ZN7WebCore13JSDOMMimeType18getOwnPropertySlotEPN3JSC9ExecStateERKNS1_10IdentifierERNS1_12PropertySlotE @@ -23118,7 +23107,6 @@ __ZNK7WebCore9DOMPlugin8filenameEv __ZN7WebCore22jsDOMPluginDescriptionEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE __ZNK7WebCore9DOMPlugin11descriptionEv __ZN7WebCore22jsDOMPluginConstructorEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE -__ZN7WebCore12JSMemoryInfoD1Ev __ZN7WebCore26jsHTMLBRElementConstructorEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE __ZN7WebCore37jsCanvasRenderingContext2DConstructorEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE __ZN7WebCore30jsHTMLCanvasElementConstructorEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE @@ -23241,7 +23229,6 @@ __ZN7WebCore16JSDOMWindowShell19getOwnPropertyNamesEPN3JSC9ExecStateERNS1_17Prop __ZN7WebCore30jsHTMLIFrameElementConstructorEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE __ZN7WebCore22JSDOMWindowConstructorD1Ev __ZN7WebCore23JSStyleMediaConstructorD1Ev -__ZN7WebCore21JSMemoryInfoPrototypeD1Ev __ZN7WebCore30setJSHTMLButtonElementDisabledEPN3JSC9ExecStateEPNS0_8JSObjectENS0_7JSValueE __ZNK7WebCore15HTMLAreaElement16isMouseFocusableEv __ZNK7WebCore15HTMLAreaElement11isFocusableEv @@ -33873,10 +33860,6 @@ __ZN7WebCore16JSMediaQueryList6s_infoE __ZTVN7WebCore21JSMediaQueryListOwnerE __ZN7WebCoreL27JSMediaQueryListTableValuesE __ZN7WebCoreL36JSMediaQueryListPrototypeTableValuesE -__ZN7WebCore21JSMemoryInfoPrototype6s_infoE -__ZN7WebCore12JSMemoryInfo6s_infoE -__ZTVN7WebCore17JSMemoryInfoOwnerE -__ZN7WebCoreL23JSMemoryInfoTableValuesE __ZN7WebCore27JSMessageChannelConstructor6s_infoE __ZN7WebCore25JSMessageChannelPrototype6s_infoE __ZN7WebCore16JSMessageChannel6s_infoE @@ -37050,10 +37033,6 @@ __ZN7WebCoreL30JSMediaQueryListPrototypeTableE __ZN7WebCoreL21JSMediaQueryListTableE __ZZN7WebCore12wrapperOwnerEPNS_15DOMWrapperWorldEPNS_14MediaQueryListEE21jsMediaQueryListOwner __ZGVZN7WebCore12wrapperOwnerEPNS_15DOMWrapperWorldEPNS_14MediaQueryListEE21jsMediaQueryListOwner -__ZN7WebCoreL26JSMemoryInfoPrototypeTableE -__ZN7WebCoreL17JSMemoryInfoTableE -__ZZN7WebCore12wrapperOwnerEPNS_15DOMWrapperWorldEPNS_10MemoryInfoEE17jsMemoryInfoOwner -__ZGVZN7WebCore12wrapperOwnerEPNS_15DOMWrapperWorldEPNS_10MemoryInfoEE17jsMemoryInfoOwner __ZN7WebCoreL21JSMessageChannelTableE __ZN7WebCoreL30JSMessageChannelPrototypeTableE __ZN7WebCoreL32JSMessageChannelConstructorTableE @@ -39424,8 +39403,6 @@ __ZL46pointerQTMoviePreventExternalURLLinksAttribute __ZL47pointerQTMovieRateChangesPreservePitchAttribute __ZZN7WebCore18quantizeMemorySizeEmE14bucketSizeList __ZGVZN7WebCore18quantizeMemorySizeEmE14bucketSizeList.b -__ZZN7WebCore10MemoryInfoC1EPNS_5FrameEE13heapSizeCache -__ZGVZN7WebCore10MemoryInfoC1EPNS_5FrameEE13heapSizeCache.b __ZN7WebCoreL19_timer_event_sourceE __ZN7WebCoreL34supportedImageMIMETypesForEncodingE __ZN7WebCoreL23supportedMediaMIMETypesE diff --git a/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj b/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj index c0c2e5025d7..e807201b411 100644 --- a/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj +++ b/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj @@ -1699,14 +1699,6 @@ true true - - true - true - true - true - true - true - true true @@ -9719,14 +9711,6 @@ true true - - true - true - true - true - true - true - true true @@ -10829,7 +10813,6 @@ - diff --git a/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters b/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters index 03e3d8a9880..f5e87238c7f 100644 --- a/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters +++ b/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters @@ -4581,9 +4581,6 @@ bindings\js - - bindings\js - bindings\js @@ -6052,9 +6049,6 @@ DerivedSources - - DerivedSources - DerivedSources @@ -13505,9 +13499,6 @@ DerivedSources - - DerivedSources - DerivedSources diff --git a/Source/WebCore/WebCore.vcxproj/WebCoreTestSupport.vcxproj b/Source/WebCore/WebCore.vcxproj/WebCoreTestSupport.vcxproj index 28f95105925..c5c03f4d13c 100644 --- a/Source/WebCore/WebCore.vcxproj/WebCoreTestSupport.vcxproj +++ b/Source/WebCore/WebCore.vcxproj/WebCoreTestSupport.vcxproj @@ -171,6 +171,38 @@ + + + + + + + + 4065;4273;4565;4701;4702;%(DisableSpecificWarnings) + 4065;4273;4565;4701;4702;%(DisableSpecificWarnings) + 4065;4273;4565;4701;4702;%(DisableSpecificWarnings) + + + + + + + + + + + + + 4065;4273;4565;4701;4702;%(DisableSpecificWarnings) + 4065;4273;4565;4701;4702;%(DisableSpecificWarnings) + 4065;4273;4565;4701;4702;%(DisableSpecificWarnings) + + + + + + + @@ -399,11 +431,13 @@ + + diff --git a/Source/WebCore/WebCore.vcxproj/WebCoreTestSupport.vcxproj.filters b/Source/WebCore/WebCore.vcxproj/WebCoreTestSupport.vcxproj.filters index fdfb84523de..45d0e8731be 100644 --- a/Source/WebCore/WebCore.vcxproj/WebCoreTestSupport.vcxproj.filters +++ b/Source/WebCore/WebCore.vcxproj/WebCoreTestSupport.vcxproj.filters @@ -15,6 +15,9 @@ DerivedSources + + DerivedSources + DerivedSources @@ -44,6 +47,9 @@ DerivedSources + + DerivedSources + DerivedSources @@ -59,6 +65,9 @@ testing + + testing + testing diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj index e0853479ca2..a2aaf98d10d 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj @@ -3300,11 +3300,6 @@ 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 */; }; - 9FDC8FF212FAB0060099AB1C /* JSMemoryInfoCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FDC8FF112FAB0060099AB1C /* JSMemoryInfoCustom.cpp */; }; - 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 */; }; A00B721A11DE6428008AB9FF /* CheckedInt.h in Headers */ = {isa = PBXBuildFile; fileRef = A00B721911DE6427008AB9FF /* CheckedInt.h */; }; A024575116CEAA27000E5671 /* EXTDrawBuffers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A024574E16CEAA27000E5671 /* EXTDrawBuffers.cpp */; }; A024575216CEAA27000E5671 /* EXTDrawBuffers.h in Headers */ = {isa = PBXBuildFile; fileRef = A024574F16CEAA27000E5671 /* EXTDrawBuffers.h */; }; @@ -5189,6 +5184,8 @@ CD37B39815C1B971006DC898 /* DiagnosticLoggingKeys.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD37B37415C1A7E1006DC898 /* DiagnosticLoggingKeys.cpp */; }; CD47B3FC16CC34F800A21EC8 /* CDMPrivateAVFoundation.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD47B3FA16CC34F800A21EC8 /* CDMPrivateAVFoundation.mm */; }; CD4AC52A1496AE9A0087C4EF /* Composite.wav in Copy Audio Resources */ = {isa = PBXBuildFile; fileRef = CD4AC5281496AE2F0087C4EF /* Composite.wav */; }; + CD5393D3175E018600C07123 /* JSMemoryInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD5393D1175E018600C07123 /* JSMemoryInfo.cpp */; }; + CD5393D4175E018600C07123 /* JSMemoryInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = CD5393D2175E018600C07123 /* JSMemoryInfo.h */; }; CD54DE4717468B6F005E5B36 /* AudioSessionManagerMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD54DE4517468B6F005E5B36 /* AudioSessionManagerMac.cpp */; }; CD54DE4B17469C6D005E5B36 /* AudioSessionMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD54DE4917469C6D005E5B36 /* AudioSessionMac.cpp */; }; CD7E05221651C28200C1201F /* WebCoreAVFResourceLoader.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD7E05211651A84100C1201F /* WebCoreAVFResourceLoader.mm */; }; @@ -9750,12 +9747,6 @@ 9FA37EF71172FD9300C4CD55 /* JSScriptProfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSScriptProfile.h; sourceTree = ""; }; 9FA37EF81172FD9300C4CD55 /* JSScriptProfileNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSScriptProfileNode.cpp; sourceTree = ""; }; 9FA37EF91172FD9300C4CD55 /* JSScriptProfileNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSScriptProfileNode.h; sourceTree = ""; }; - 9FDC8FF112FAB0060099AB1C /* JSMemoryInfoCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMemoryInfoCustom.cpp; sourceTree = ""; }; - 9FFE3E7811B59C5D0037874E /* MemoryInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MemoryInfo.cpp; sourceTree = ""; }; - 9FFE3E7911B59C5D0037874E /* MemoryInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemoryInfo.h; sourceTree = ""; }; - 9FFE3E7C11B59C6E0037874E /* MemoryInfo.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MemoryInfo.idl; sourceTree = ""; }; - 9FFE3EA311B5A4390037874E /* JSMemoryInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMemoryInfo.cpp; sourceTree = ""; }; - 9FFE3EA411B5A4390037874E /* JSMemoryInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMemoryInfo.h; sourceTree = ""; }; A00B721911DE6427008AB9FF /* CheckedInt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CheckedInt.h; path = canvas/CheckedInt.h; sourceTree = ""; }; A024574E16CEAA27000E5671 /* EXTDrawBuffers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EXTDrawBuffers.cpp; path = canvas/EXTDrawBuffers.cpp; sourceTree = ""; }; A024574F16CEAA27000E5671 /* EXTDrawBuffers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EXTDrawBuffers.h; path = canvas/EXTDrawBuffers.h; sourceTree = ""; }; @@ -11919,6 +11910,10 @@ CD47B3FA16CC34F800A21EC8 /* CDMPrivateAVFoundation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = CDMPrivateAVFoundation.mm; path = Modules/encryptedmedia/CDMPrivateAVFoundation.mm; sourceTree = ""; }; CD4AC5281496AE2F0087C4EF /* Composite.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = Composite.wav; path = platform/audio/resources/Composite.wav; sourceTree = SOURCE_ROOT; }; CD4E0AFA11F7BC27009D3811 /* fullscreen.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = fullscreen.css; sourceTree = ""; }; + CD5393CB175DCCE600C07123 /* MemoryInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemoryInfo.h; sourceTree = ""; }; + CD5393CC175DCCE600C07123 /* MemoryInfo.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MemoryInfo.idl; sourceTree = ""; }; + CD5393D1175E018600C07123 /* JSMemoryInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMemoryInfo.cpp; sourceTree = ""; }; + CD5393D2175E018600C07123 /* JSMemoryInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMemoryInfo.h; sourceTree = ""; }; CD54DE4517468B6F005E5B36 /* AudioSessionManagerMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioSessionManagerMac.cpp; sourceTree = ""; }; CD54DE4917469C6D005E5B36 /* AudioSessionMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioSessionMac.cpp; sourceTree = ""; }; CD7E05201651A84100C1201F /* WebCoreAVFResourceLoader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WebCoreAVFResourceLoader.h; path = objc/WebCoreAVFResourceLoader.h; sourceTree = ""; }; @@ -13916,6 +13911,8 @@ A7BF7EDE14C9175A0014489D /* InternalSettings.idl */, A7BE7EDD14C9175A0014489D /* MallocStatistics.h */, A7BE7EDE14C9175A0014489D /* MallocStatistics.idl */, + CD5393CB175DCCE600C07123 /* MemoryInfo.h */, + CD5393CC175DCCE600C07123 /* MemoryInfo.idl */, CDC26B3C160A62B00026757B /* MockCDM.cpp */, CDC26B3D160A62B00026757B /* MockCDM.h */, EB081CD81696084400553730 /* TypeConversions.h */, @@ -13938,6 +13935,8 @@ A7B4EA6914C9348400C8F5BF /* JSMallocStatistics.h */, EBF5121A1696496C0056BD25 /* JSTypeConversions.cpp */, EBF5121B1696496C0056BD25 /* JSTypeConversions.h */, + CD5393D1175E018600C07123 /* JSMemoryInfo.cpp */, + CD5393D2175E018600C07123 /* JSMemoryInfo.h */, ); name = Testing; sourceTree = ""; @@ -14737,9 +14736,6 @@ BCE1C4220D9829F2003B02F2 /* Location.idl */, BC59DEFA169DEDD80016AC34 /* make_settings.pl */, 931BCC601124DFCB00BE70DD /* MediaCanStartListener.h */, - 9FFE3E7811B59C5D0037874E /* MemoryInfo.cpp */, - 9FFE3E7911B59C5D0037874E /* MemoryInfo.h */, - 9FFE3E7C11B59C6E0037874E /* MemoryInfo.idl */, 93EB355E09E37FD600F43799 /* MouseEventWithHitTestResults.cpp */, 935C476209AC4CE600A6AAB4 /* MouseEventWithHitTestResults.h */, A9C6E5A30D746458006442E9 /* Navigator.cpp */, @@ -18860,7 +18856,6 @@ 1C5FAEE60DCFDA6800D58F78 /* JSJavaScriptCallFrameCustom.cpp */, BCE1C43F0D9830F4003B02F2 /* JSLocationCustom.cpp */, AD726FE716D9F204003A4E6D /* JSMediaListCustom.h */, - 9FDC8FF112FAB0060099AB1C /* JSMemoryInfoCustom.cpp */, E1A5F99A0E7EAA2500AF85EA /* JSMessageChannelCustom.cpp */, 410B7E711045FAB000D8224F /* JSMessageEventCustom.cpp */, E1ADED460E76B8DD004A1A5E /* JSMessagePortCustom.cpp */, @@ -19021,8 +19016,6 @@ BC94D14D0C275C68006BC617 /* JSHistory.h */, BCE1C4390D9830D3003B02F2 /* JSLocation.cpp */, BCE1C43A0D9830D3003B02F2 /* JSLocation.h */, - 9FFE3EA311B5A4390037874E /* JSMemoryInfo.cpp */, - 9FFE3EA411B5A4390037874E /* JSMemoryInfo.h */, A9D247F50D757E3300FDF959 /* JSNavigator.cpp */, A9D247F60D757E3300FDF959 /* JSNavigator.h */, E51A81DE17298D7700BFCA61 /* JSPerformance.cpp */, @@ -20855,6 +20848,7 @@ CDC26B41160A8CCE0026757B /* MockCDM.h in Headers */, AA5F3B8D16CC33D100455EB0 /* PlatformSpeechSynthesizerMock.h in Headers */, 41815C1F138319830057AAA4 /* WebCoreTestSupport.h in Headers */, + CD5393D4175E018600C07123 /* JSMemoryInfo.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -22425,7 +22419,6 @@ BC3C39B70C0D3D8D005F4D7A /* JSMediaList.h in Headers */, D3A94A47122DC40F00A37BBC /* JSMediaQueryList.h in Headers */, FDBD480D159BC6870093EB4F /* JSMediaStreamAudioSourceNode.h in Headers */, - 9FFE3EA611B5A4390037874E /* JSMemoryInfo.h in Headers */, E107400E0E77BDC00033AF24 /* JSMessageChannel.h in Headers */, 75793EC90D0CE72D007FC0AC /* JSMessageEvent.h in Headers */, E1ADEDDA0E76BD93004A1A5E /* JSMessagePort.h in Headers */, @@ -22819,7 +22812,6 @@ D3AA10F4123A98AA0092152B /* MediaQueryMatcher.h in Headers */, FD671A78159BB07000197559 /* MediaStreamAudioSourceNode.h in Headers */, BCB16C180979C3BD00467741 /* MemoryCache.h in Headers */, - 9FFE3E7B11B59C5D0037874E /* MemoryInfo.h in Headers */, 6571DCC81385E6A400702DD0 /* MemoryPressureHandler.h in Headers */, 93309DFA099E64920056E581 /* MergeIdenticalElementsCommand.h in Headers */, E1ADECCE0E76AD8B004A1A5E /* MessageChannel.h in Headers */, @@ -24336,6 +24328,7 @@ CDC26B40160A8CC60026757B /* MockCDM.cpp in Sources */, AA5F3B8F16CC4B3900455EB0 /* PlatformSpeechSynthesizerMock.cpp in Sources */, 41815C1E138319830057AAA4 /* WebCoreTestSupport.cpp in Sources */, + CD5393D3175E018600C07123 /* JSMemoryInfo.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -25591,8 +25584,6 @@ BC3C39B60C0D3D8D005F4D7A /* JSMediaList.cpp in Sources */, D3A94A46122DC40F00A37BBC /* JSMediaQueryList.cpp in Sources */, FDBD480C159BC6870093EB4F /* JSMediaStreamAudioSourceNode.cpp in Sources */, - 9FFE3EA511B5A4390037874E /* JSMemoryInfo.cpp in Sources */, - 9FDC8FF212FAB0060099AB1C /* JSMemoryInfoCustom.cpp in Sources */, E107400D0E77BDC00033AF24 /* JSMessageChannel.cpp in Sources */, E1A5F99B0E7EAA2500AF85EA /* JSMessageChannelCustom.cpp in Sources */, 75793EC80D0CE72D007FC0AC /* JSMessageEvent.cpp in Sources */, @@ -26006,7 +25997,6 @@ D3AA10F3123A98AA0092152B /* MediaQueryMatcher.cpp in Sources */, FD671A77159BB07000197559 /* MediaStreamAudioSourceNode.cpp in Sources */, BCB16C170979C3BD00467741 /* MemoryCache.cpp in Sources */, - 9FFE3E7A11B59C5D0037874E /* MemoryInfo.cpp in Sources */, 657EDA081385CB97004E0645 /* MemoryPressureHandler.cpp in Sources */, 657EDA0B1385CBD8004E0645 /* MemoryPressureHandlerMac.mm in Sources */, 93309DF9099E64920056E581 /* MergeIdenticalElementsCommand.cpp in Sources */, diff --git a/Source/WebCore/bindings/gobject/GNUmakefile.am b/Source/WebCore/bindings/gobject/GNUmakefile.am index 02c0ebe5b9a..0b1ae84e96a 100644 --- a/Source/WebCore/bindings/gobject/GNUmakefile.am +++ b/Source/WebCore/bindings/gobject/GNUmakefile.am @@ -213,8 +213,6 @@ webkitgtk_gdom_built_sources += \ DerivedSources/webkitdom/WebKitDOMMediaListPrivate.h \ DerivedSources/webkitdom/WebKitDOMMediaQueryList.cpp \ DerivedSources/webkitdom/WebKitDOMMediaQueryListPrivate.h \ - DerivedSources/webkitdom/WebKitDOMMemoryInfo.cpp \ - DerivedSources/webkitdom/WebKitDOMMemoryInfoPrivate.h \ DerivedSources/webkitdom/WebKitDOMMessagePort.cpp \ DerivedSources/webkitdom/WebKitDOMMessagePortPrivate.h \ DerivedSources/webkitdom/WebKitDOMMicroDataItemValue.cpp \ @@ -406,7 +404,6 @@ webkitgtk_gdom_built_h_api += \ DerivedSources/webkitdom/WebKitDOMEventTarget.h \ DerivedSources/webkitdom/WebKitDOMHistory.h \ DerivedSources/webkitdom/WebKitDOMLocation.h \ - DerivedSources/webkitdom/WebKitDOMMemoryInfo.h \ DerivedSources/webkitdom/WebKitDOMMicroDataItemValue.h \ DerivedSources/webkitdom/WebKitDOMObject.h \ DerivedSources/webkitdom/WebKitDOMNavigator.h \ diff --git a/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp b/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp index c6bbf3bde4e..e3e7aea7d90 100644 --- a/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp +++ b/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp @@ -111,7 +111,6 @@ #include "JSLocationCustom.cpp" #include "JSMainThreadExecState.cpp" #include "JSMediaListCustom.cpp" -#include "JSMemoryInfoCustom.cpp" #include "JSMessageChannelCustom.cpp" #include "JSMessageEventCustom.cpp" #include "JSMessagePortCustom.cpp" @@ -160,7 +159,6 @@ #include "JSXPathResultCustom.cpp" #include "JSXSLTProcessorCustom.cpp" #include "JavaScriptCallFrame.cpp" -#include "MemoryInfo.cpp" #include "PageScriptDebugServer.cpp" #include "ScheduledAction.cpp" #include "ScriptCachedFrameData.cpp" diff --git a/Source/WebCore/bindings/js/JSMemoryInfoCustom.cpp b/Source/WebCore/bindings/js/JSMemoryInfoCustom.cpp deleted file mode 100644 index 94c0e8a1c54..00000000000 --- a/Source/WebCore/bindings/js/JSMemoryInfoCustom.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2011 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 "JSMemoryInfo.h" - -using namespace JSC; - -namespace WebCore { - -JSValue JSMemoryInfo::jsHeapSizeLimit(ExecState*) const -{ - return jsUndefined(); -} - -} // namespace WebCore diff --git a/Source/WebCore/bindings/js/ScriptGCEvent.cpp b/Source/WebCore/bindings/js/ScriptGCEvent.cpp index 5a5dc8f6964..2acb3077cd9 100644 --- a/Source/WebCore/bindings/js/ScriptGCEvent.cpp +++ b/Source/WebCore/bindings/js/ScriptGCEvent.cpp @@ -30,8 +30,6 @@ #include "config.h" -#if ENABLE(INSPECTOR) - #include "ScriptGCEvent.h" #include "JSDOMWindow.h" @@ -48,9 +46,6 @@ void ScriptGCEvent::getHeapSize(HeapInfo& info) VM* vm = JSDOMWindow::commonVM(); info.totalJSHeapSize = vm->heap.capacity(); info.usedJSHeapSize = vm->heap.size(); - info.jsHeapSizeLimit = 0; } } // namespace WebCore - -#endif // ENABLE(INSPECTOR) diff --git a/Source/WebCore/bindings/js/ScriptGCEvent.h b/Source/WebCore/bindings/js/ScriptGCEvent.h index 12665016094..b69a794748a 100644 --- a/Source/WebCore/bindings/js/ScriptGCEvent.h +++ b/Source/WebCore/bindings/js/ScriptGCEvent.h @@ -37,17 +37,13 @@ struct HeapInfo { HeapInfo() : usedJSHeapSize(0) , totalJSHeapSize(0) - , jsHeapSizeLimit(0) { } size_t usedJSHeapSize; size_t totalJSHeapSize; - size_t jsHeapSizeLimit; }; -#if ENABLE(INSPECTOR) - class ScriptGCEventListener; class ScriptGCEvent @@ -58,8 +54,6 @@ public: static void getHeapSize(HeapInfo&); }; -#endif // ENABLE(INSPECTOR) - } // namespace WebCore #endif // !defined(ScriptGCEvent_h) diff --git a/Source/WebCore/page/Console.cpp b/Source/WebCore/page/Console.cpp index 4e4f0f9b04c..e5f74aba6e9 100644 --- a/Source/WebCore/page/Console.cpp +++ b/Source/WebCore/page/Console.cpp @@ -39,7 +39,6 @@ #include "FrameTree.h" #include "InspectorConsoleInstrumentation.h" #include "InspectorController.h" -#include "MemoryInfo.h" #include "Page.h" #include "PageConsole.h" #include "PageGroup.h" @@ -254,13 +253,6 @@ void Console::groupEnd() InspectorInstrumentation::addMessageToConsole(page(), ConsoleAPIMessageSource, EndGroupMessageType, LogMessageLevel, String(), String(), 0, 0); } -PassRefPtr Console::memory() const -{ - // FIXME: Because we create a new object here each time, - // console.memory !== console.memory, which seems wrong. - return MemoryInfo::create(m_frame); -} - Page* Console::page() const { if (!m_frame) diff --git a/Source/WebCore/page/Console.h b/Source/WebCore/page/Console.h index b8e75115b15..18bd4765ef3 100644 --- a/Source/WebCore/page/Console.h +++ b/Source/WebCore/page/Console.h @@ -40,7 +40,6 @@ namespace WebCore { class Frame; -class MemoryInfo; class Page; class ScriptArguments; @@ -78,8 +77,6 @@ public: void groupCollapsed(ScriptState*, PassRefPtr); void groupEnd(); - PassRefPtr memory() const; - private: inline Page* page() const; diff --git a/Source/WebCore/page/Console.idl b/Source/WebCore/page/Console.idl index 2be93f90157..c9525cfac45 100644 --- a/Source/WebCore/page/Console.idl +++ b/Source/WebCore/page/Console.idl @@ -59,7 +59,5 @@ [CallWith=ScriptArguments|ScriptState] void groupCollapsed(); void groupEnd(); [CallWith=ScriptArguments|ScriptState] void clear(); - - readonly attribute MemoryInfo memory; }; diff --git a/Source/WebCore/page/MemoryInfo.cpp b/Source/WebCore/page/MemoryInfo.cpp deleted file mode 100644 index 836ec3328fa..00000000000 --- a/Source/WebCore/page/MemoryInfo.cpp +++ /dev/null @@ -1,152 +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 "Frame.h" -#include "ScriptGCEvent.h" -#include "Settings.h" -#include -#include -#include - -namespace WebCore { - -#if ENABLE(INSPECTOR) - -class HeapSizeCache { - WTF_MAKE_NONCOPYABLE(HeapSizeCache); WTF_MAKE_FAST_ALLOCATED; -public: - HeapSizeCache() - : m_lastUpdateTime(0) - { - } - - void getCachedHeapSize(HeapInfo& info) - { - maybeUpdate(); - info = m_info; - } - -private: - void maybeUpdate() - { - // We rate-limit queries to once every twenty minutes to make it more difficult - // for attackers to compare memory usage before and after some event. - const double TwentyMinutesInSeconds = 20 * 60; - - double now = monotonicallyIncreasingTime(); - if (now - m_lastUpdateTime >= TwentyMinutesInSeconds) { - update(); - m_lastUpdateTime = now; - } - } - - void update() - { - ScriptGCEvent::getHeapSize(m_info); - m_info.usedJSHeapSize = quantizeMemorySize(m_info.usedJSHeapSize); - m_info.totalJSHeapSize = quantizeMemorySize(m_info.totalJSHeapSize); - m_info.jsHeapSizeLimit = quantizeMemorySize(m_info.jsHeapSizeLimit); - } - - double m_lastUpdateTime; - - HeapInfo m_info; -}; - -// We quantize the sizes to make it more difficult for an attacker to see precise -// impact of operations on memory. The values are used for performance tuning, -// and hence don't need to be as refined when the value is large, so we threshold -// at a list of exponentially separated buckets. -size_t quantizeMemorySize(size_t size) -{ - const int numberOfBuckets = 100; - DEFINE_STATIC_LOCAL(Vector, bucketSizeList, ()); - - ASSERT(isMainThread()); - if (bucketSizeList.isEmpty()) { - bucketSizeList.resize(numberOfBuckets); - - float sizeOfNextBucket = 10000000.0; // First bucket size is roughly 10M. - const float largestBucketSize = 4000000000.0; // Roughly 4GB. - // We scale with the Nth root of the ratio, so that we use all the bucktes. - const float scalingFactor = exp(log(largestBucketSize / sizeOfNextBucket) / numberOfBuckets); - - size_t nextPowerOfTen = static_cast(pow(10, floor(log10(sizeOfNextBucket)) + 1) + 0.5); - size_t granularity = nextPowerOfTen / 1000; // We want 3 signficant digits. - - for (int i = 0; i < numberOfBuckets; ++i) { - size_t currentBucketSize = static_cast(sizeOfNextBucket); - bucketSizeList[i] = currentBucketSize - (currentBucketSize % granularity); - - sizeOfNextBucket *= scalingFactor; - if (sizeOfNextBucket >= nextPowerOfTen) { - if (std::numeric_limits::max() / 10 <= nextPowerOfTen) - nextPowerOfTen = std::numeric_limits::max(); - else { - nextPowerOfTen *= 10; - granularity *= 10; - } - } - - // Watch out for overflow, if the range is too large for size_t. - if (i > 0 && bucketSizeList[i] < bucketSizeList[i - 1]) - bucketSizeList[i] = std::numeric_limits::max(); - } - } - - for (int i = 0; i < numberOfBuckets; ++i) { - if (size <= bucketSizeList[i]) - return bucketSizeList[i]; - } - - return bucketSizeList[numberOfBuckets - 1]; -} - -#endif - -MemoryInfo::MemoryInfo(Frame* frame) -{ - if (!frame || !frame->settings()) - return; - -#if ENABLE(INSPECTOR) - if (frame->settings()->memoryInfoEnabled()) - ScriptGCEvent::getHeapSize(m_info); - else if (true || frame->settings()->quantizedMemoryInfoEnabled()) { - DEFINE_STATIC_LOCAL(HeapSizeCache, heapSizeCache, ()); - heapSizeCache.getCachedHeapSize(m_info); - } -#endif -} - -} // namespace WebCore diff --git a/Source/WebCore/page/Performance.cpp b/Source/WebCore/page/Performance.cpp index 28c2a463623..9dcf46e13c3 100644 --- a/Source/WebCore/page/Performance.cpp +++ b/Source/WebCore/page/Performance.cpp @@ -34,7 +34,6 @@ #include "Document.h" #include "DocumentLoader.h" -#include "MemoryInfo.h" #include "PerformanceEntry.h" #include "PerformanceNavigation.h" #include "PerformanceResourceTiming.h" @@ -80,11 +79,6 @@ ScriptExecutionContext* Performance::scriptExecutionContext() const return frame()->document(); } -PassRefPtr Performance::memory() const -{ - return MemoryInfo::create(m_frame); -} - PerformanceNavigation* Performance::navigation() const { if (!m_navigation) diff --git a/Source/WebCore/page/Performance.h b/Source/WebCore/page/Performance.h index 75103894310..9f4e60285dd 100644 --- a/Source/WebCore/page/Performance.h +++ b/Source/WebCore/page/Performance.h @@ -36,7 +36,6 @@ #include "DOMWindowProperty.h" #include "EventTarget.h" -#include "MemoryInfo.h" #include "PerformanceEntryList.h" #include "PerformanceNavigation.h" #include "PerformanceTiming.h" @@ -61,7 +60,6 @@ public: virtual const AtomicString& interfaceName() const; virtual ScriptExecutionContext* scriptExecutionContext() const; - PassRefPtr memory() const; PerformanceNavigation* navigation() const; PerformanceTiming* timing() const; double now() const; diff --git a/Source/WebCore/page/Performance.idl b/Source/WebCore/page/Performance.idl index ea90a2ea0fd..a50d42a91f3 100644 --- a/Source/WebCore/page/Performance.idl +++ b/Source/WebCore/page/Performance.idl @@ -36,7 +36,6 @@ ] interface Performance { readonly attribute PerformanceNavigation navigation; readonly attribute PerformanceTiming timing; - readonly attribute MemoryInfo memory; #if defined(ENABLE_PERFORMANCE_TIMELINE) && ENABLE_PERFORMANCE_TIMELINE PerformanceEntryList webkitGetEntries(); diff --git a/Source/WebCore/testing/Internals.cpp b/Source/WebCore/testing/Internals.cpp index a2f92385107..454d31c1b65 100644 --- a/Source/WebCore/testing/Internals.cpp +++ b/Source/WebCore/testing/Internals.cpp @@ -72,6 +72,7 @@ #include "Language.h" #include "MallocStatistics.h" #include "MemoryCache.h" +#include "MemoryInfo.h" #include "NodeRenderingContext.h" #include "Page.h" #include "PrintContext.h" @@ -1863,6 +1864,11 @@ PassRefPtr Internals::typeConversions() const return TypeConversions::create(); } +PassRefPtr Internals::memoryInfo() const +{ + return MemoryInfo::create(); +} + Vector Internals::getReferencedFilePaths() const { frame()->loader()->history()->saveDocumentAndScrollState(); diff --git a/Source/WebCore/testing/Internals.h b/Source/WebCore/testing/Internals.h index d923f72af8a..2ec93fb8303 100644 --- a/Source/WebCore/testing/Internals.h +++ b/Source/WebCore/testing/Internals.h @@ -49,6 +49,7 @@ class Element; class Frame; class InspectorFrontendChannelDummy; class InternalSettings; +class MemoryInfo; class Node; class Page; class Range; @@ -274,6 +275,7 @@ public: PassRefPtr mallocStatistics() const; PassRefPtr typeConversions() const; + PassRefPtr memoryInfo() const; Vector getReferencedFilePaths() const; diff --git a/Source/WebCore/testing/Internals.idl b/Source/WebCore/testing/Internals.idl index abb15b78da1..ff8212f6bde 100644 --- a/Source/WebCore/testing/Internals.idl +++ b/Source/WebCore/testing/Internals.idl @@ -233,6 +233,7 @@ MallocStatistics mallocStatistics(); TypeConversions typeConversions(); + MemoryInfo memoryInfo(); DOMString[] getReferencedFilePaths(); diff --git a/Source/WebCore/page/MemoryInfo.h b/Source/WebCore/testing/MemoryInfo.h similarity index 88% rename from Source/WebCore/page/MemoryInfo.h rename to Source/WebCore/testing/MemoryInfo.h index a6557b3b825..94158b6cb1e 100644 --- a/Source/WebCore/page/MemoryInfo.h +++ b/Source/WebCore/testing/MemoryInfo.h @@ -37,24 +37,22 @@ namespace WebCore { -class Frame; - class MemoryInfo : public RefCounted { public: - static PassRefPtr create(Frame* frame) { return adoptRef(new MemoryInfo(frame)); } + static PassRefPtr create() { return adoptRef(new MemoryInfo); } - size_t totalJSHeapSize() const { return m_info.totalJSHeapSize; } size_t usedJSHeapSize() const { return m_info.usedJSHeapSize; } - size_t jsHeapSizeLimit() const { return m_info.jsHeapSizeLimit; } + size_t totalJSHeapSize() const { return m_info.totalJSHeapSize; } private: - explicit MemoryInfo(Frame*); + explicit MemoryInfo() + { + ScriptGCEvent::getHeapSize(m_info); + } HeapInfo m_info; }; -size_t quantizeMemorySize(size_t); - } // namespace WebCore #endif // MemoryInfo_h diff --git a/Source/WebCore/page/MemoryInfo.idl b/Source/WebCore/testing/MemoryInfo.idl similarity index 96% rename from Source/WebCore/page/MemoryInfo.idl rename to Source/WebCore/testing/MemoryInfo.idl index 86f724e5ff1..0112d45e4fc 100644 --- a/Source/WebCore/page/MemoryInfo.idl +++ b/Source/WebCore/testing/MemoryInfo.idl @@ -33,10 +33,6 @@ OmitConstructor, ImplementationLacksVTable ] interface MemoryInfo { - - readonly attribute unsigned long totalJSHeapSize; readonly attribute unsigned long usedJSHeapSize; - [CustomGetter] readonly attribute unsigned long jsHeapSizeLimit; - + readonly attribute unsigned long totalJSHeapSize; }; - diff --git a/Source/autotools/symbols.filter b/Source/autotools/symbols.filter index bd4e52143e4..55f6b616498 100644 --- a/Source/autotools/symbols.filter +++ b/Source/autotools/symbols.filter @@ -318,6 +318,7 @@ _ZN7WebCore10ClientRectC1ERKNS_9FloatRectE; _ZN7WebCore13BatteryStatus6createEbddd; _ZN7WebCore17BatteryController14supplementNameEv; _ZN7WebCore17BatteryController22didChangeBatteryStatusERKN3WTF12AtomicStringENS1_10PassRefPtrINS_13BatteryStatusEEE; +_ZN7WebCore13ScriptGCEvent11getHeapSizeERNS_8HeapInfoE; local: _Z*; diff --git a/Tools/ChangeLog b/Tools/ChangeLog index 9ab3b3ae8fd..55a629f8ff2 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,15 @@ +2013-06-05 Zan Dobersek + + Move MemoryInfo under window.internals + https://bugs.webkit.org/show_bug.cgi?id=117197 + + Reviewed by Ryosuke Niwa. + + * GNUmakefile.am: Add the testing/MemoryInfo.(h|idl) files and the generated targets to + the Automake build + * Scripts/webkitperl/filter-build-webkit_unittest/shouldIgnoreLine_unittests.pl: List the + testing/MemoryInfo.idl file instead of page/MemoryInfo.idl. + 2013-06-03 Roger Fong Remove uses of VS2005 scripts, executables and associated environment variables from scripts. diff --git a/Tools/GNUmakefile.am b/Tools/GNUmakefile.am index dc0ae0c9305..6861b011677 100644 --- a/Tools/GNUmakefile.am +++ b/Tools/GNUmakefile.am @@ -54,6 +54,7 @@ libWebCoreInternals_la_SOURCES = \ Source/WebCore/bindings/js/JSDOMWrapper.cpp \ Source/WebCore/bindings/js/JSDOMWrapper.h \ Source/WebCore/testing/MallocStatistics.h \ + Source/WebCore/testing/MemoryInfo.h \ Source/WebCore/testing/Internals.cpp \ Source/WebCore/testing/Internals.h \ Source/WebCore/testing/InternalSettings.cpp \ @@ -67,6 +68,8 @@ libwebcoreinternals_built_sources += \ DerivedSources/WebCore/InternalSettingsGenerated.h \ DerivedSources/WebCore/JSMallocStatistics.cpp \ DerivedSources/WebCore/JSMallocStatistics.h \ + DerivedSources/WebCore/JSMemoryInfo.cpp \ + DerivedSources/WebCore/JSMemoryInfo.h \ DerivedSources/WebCore/JSInternals.cpp \ DerivedSources/WebCore/JSInternals.h \ DerivedSources/WebCore/JSInternalSettings.cpp \ diff --git a/Tools/Scripts/webkitperl/filter-build-webkit_unittest/shouldIgnoreLine_unittests.pl b/Tools/Scripts/webkitperl/filter-build-webkit_unittest/shouldIgnoreLine_unittests.pl index 60a37defcad..0970e9aa29e 100644 --- a/Tools/Scripts/webkitperl/filter-build-webkit_unittest/shouldIgnoreLine_unittests.pl +++ b/Tools/Scripts/webkitperl/filter-build-webkit_unittest/shouldIgnoreLine_unittests.pl @@ -56,7 +56,7 @@ Creating hashtable for JavaScriptCore/runtime/ArrayConstructor.cpp Wrote output to /Volumes/Data/Build/Release/DerivedSources/WebCore/ExportFileGenerator.cpp /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/libtool: file: /Volumes/Data/Build/ANGLE.build/Release/ANGLE.build/Objects-normal/i386/debug.o has no symbols Showing first 200 notices only -printf "WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.idl\nWebCore/Modules/encryptedmedia/MediaKeyNeededEvent.idl\nWebCore/Modules/encryptedmedia/MediaKeySession.idl\nWebCore/Modules/encryptedmedia/MediaKeys.idl\nWebCore/Modules/filesystem/DOMFileSystem.idl\nWebCore/Modules/filesystem/DOMFileSystemSync.idl\nWebCore/Modules/filesystem/DOMWindowFileSystem.idl\nWebCore/Modules/filesystem/DirectoryEntry.idl\nWebCore/Modules/filesystem/DirectoryEntrySync.idl\nWebCore/Modules/filesystem/DirectoryReader.idl\nWebCore/Modules/filesystem/DirectoryReaderSync.idl\nWebCore/Modules/filesystem/EntriesCallback.idl\nWebCore/Modules/filesystem/Entry.idl\nWebCore/Modules/filesystem/EntryArray.idl\nWebCore/Modules/filesystem/EntryArraySync.idl\nWebCore/Modules/filesystem/EntryCallback.idl\nWebCore/Modules/filesystem/EntrySync.idl\nWebCore/Modules/filesystem/ErrorCallback.idl\nWebCore/Modules/filesystem/FileCallback.idl\nWebCore/Modules/filesystem/FileEntry.idl\nWebCore/Modules/filesystem/FileEntrySync.idl\nWebCore/Modules/filesystem/FileSystemCallback.idl\nWebCore/Modules/filesystem/FileWriter.idl\nWebCore/Modules/filesystem/FileWriterCallback.idl\nWebCore/Modules/filesystem/FileWriterSync.idl\nWebCore/Modules/filesystem/Metadata.idl\nWebCore/Modules/filesystem/MetadataCallback.idl\nWebCore/Modules/filesystem/WorkerContextFileSystem.idl\nWebCore/Modules/geolocation/Coordinates.idl\nWebCore/Modules/geolocation/Geolocation.idl\nWebCore/Modules/geolocation/Geoposition.idl\nWebCore/Modules/geolocation/NavigatorGeolocation.idl\nWebCore/Modules/geolocation/PositionCallback.idl\nWebCore/Modules/geolocation/PositionError.idl\nWebCore/Modules/geolocation/PositionErrorCallback.idl\nWebCore/Modules/indexeddb/DOMWindowIndexedDatabase.idl\nWebCore/Modules/indexeddb/IDBAny.idl\nWebCore/Modules/indexeddb/IDBCursor.idl\nWebCore/Modules/indexeddb/IDBDatabase.idl\nWebCore/Modules/indexeddb/IDBFactory.idl\nWebCore/Modules/indexeddb/IDBIndex.idl\nWebCore/Modules/indexeddb/IDBKeyRange.idl\nWebCore/Modules/indexeddb/IDBObjectStore.idl\nWebCore/Modules/indexeddb/IDBRequest.idl\nWebCore/Modules/indexeddb/IDBTransaction.idl\nWebCore/Modules/indexeddb/IDBVersionChangeEvent.idl\nWebCore/Modules/indexeddb/WorkerContextIndexedDatabase.idl\nWebCore/Modules/mediasource/MediaSource.idl\nWebCore/Modules/mediasource/SourceBuffer.idl\nWebCore/Modules/mediasource/SourceBufferList.idl\nWebCore/Modules/notifications/DOMWindowNotifications.idl\nWebCore/Modules/notifications/Notification.idl\nWebCore/Modules/notifications/NotificationCenter.idl\nWebCore/Modules/notifications/NotificationPermissionCallback.idl\nWebCore/Modules/notifications/WorkerContextNotifications.idl\nWebCore/Modules/quota/DOMWindowQuota.idl\nWebCore/Modules/quota/NavigatorStorageQuota.idl\nWebCore/Modules/quota/StorageInfo.idl\nWebCore/Modules/quota/StorageErrorCallback.idl\nWebCore/Modules/quota/StorageQuota.idl\nWebCore/Modules/quota/StorageQuotaCallback.idl\nWebCore/Modules/quota/StorageUsageCallback.idl\nWebCore/Modules/quota/WorkerNavigatorStorageQuota.idl\nWebCore/Modules/speech/DOMWindowSpeechSynthesis.idl\nWebCore/Modules/speech/SpeechSynthesis.idl\nWebCore/Modules/speech/SpeechSynthesisEvent.idl\nWebCore/Modules/speech/SpeechSynthesisUtterance.idl\nWebCore/Modules/speech/SpeechSynthesisVoice.idl\nWebCore/Modules/webaudio/AudioBuffer.idl\nWebCore/Modules/webaudio/AudioBufferCallback.idl\nWebCore/Modules/webaudio/AudioBufferSourceNode.idl\nWebCore/Modules/webaudio/ChannelMergerNode.idl\nWebCore/Modules/webaudio/ChannelSplitterNode.idl\nWebCore/Modules/webaudio/AudioContext.idl\nWebCore/Modules/webaudio/AudioDestinationNode.idl\nWebCore/Modules/webaudio/GainNode.idl\nWebCore/Modules/webaudio/AudioListener.idl\nWebCore/Modules/webaudio/AudioNode.idl\nWebCore/Modules/webaudio/PannerNode.idl\nWebCore/Modules/webaudio/AudioParam.idl\nWebCore/Modules/webaudio/AudioProcessingEvent.idl\nWebCore/Modules/webaudio/BiquadFilterNode.idl\nWebCore/Modules/webaudio/ConvolverNode.idl\nWebCore/Modules/webaudio/DOMWindowWebAudio.idl\nWebCore/Modules/webaudio/DelayNode.idl\nWebCore/Modules/webaudio/DynamicsCompressorNode.idl\nWebCore/Modules/webaudio/ScriptProcessorNode.idl\nWebCore/Modules/webaudio/MediaElementAudioSourceNode.idl\nWebCore/Modules/webaudio/MediaStreamAudioSourceNode.idl\nWebCore/Modules/webaudio/OscillatorNode.idl\nWebCore/Modules/webaudio/OfflineAudioContext.idl\nWebCore/Modules/webaudio/OfflineAudioCompletionEvent.idl\nWebCore/Modules/webaudio/AnalyserNode.idl\nWebCore/Modules/webaudio/WaveShaperNode.idl\nWebCore/Modules/webaudio/WaveTable.idl\nWebCore/Modules/webdatabase/DOMWindowWebDatabase.idl\nWebCore/Modules/webdatabase/Database.idl\nWebCore/Modules/webdatabase/DatabaseCallback.idl\nWebCore/Modules/webdatabase/DatabaseSync.idl\nWebCore/Modules/webdatabase/SQLError.idl\nWebCore/Modules/webdatabase/SQLException.idl\nWebCore/Modules/webdatabase/SQLResultSet.idl\nWebCore/Modules/webdatabase/SQLResultSetRowList.idl\nWebCore/Modules/webdatabase/SQLStatementCallback.idl\nWebCore/Modules/webdatabase/SQLStatementErrorCallback.idl\nWebCore/Modules/webdatabase/SQLTransaction.idl\nWebCore/Modules/webdatabase/SQLTransactionCallback.idl\nWebCore/Modules/webdatabase/SQLTransactionErrorCallback.idl\nWebCore/Modules/webdatabase/SQLTransactionSync.idl\nWebCore/Modules/webdatabase/SQLTransactionSyncCallback.idl\nWebCore/Modules/webdatabase/WorkerContextWebDatabase.idl\nWebCore/Modules/websockets/CloseEvent.idl\nWebCore/Modules/websockets/DOMWindowWebSocket.idl\nWebCore/Modules/websockets/WebSocket.idl\nWebCore/Modules/websockets/WorkerContextWebSocket.idl\nWebCore/css/CSSCharsetRule.idl\nWebCore/css/CSSFontFaceLoadEvent.idl\nWebCore/css/CSSFontFaceRule.idl\nWebCore/css/CSSHostRule.idl\nWebCore/css/CSSImportRule.idl\nWebCore/css/CSSMediaRule.idl\nWebCore/css/CSSPageRule.idl\nWebCore/css/CSSPrimitiveValue.idl\nWebCore/css/CSSRule.idl\nWebCore/css/CSSRuleList.idl\nWebCore/css/CSSStyleDeclaration.idl\nWebCore/css/CSSStyleRule.idl\nWebCore/css/CSSStyleSheet.idl\nWebCore/css/CSSSupportsRule.idl\nWebCore/css/CSSUnknownRule.idl\nWebCore/css/CSSValue.idl\nWebCore/css/CSSValueList.idl\nWebCore/css/Counter.idl\nWebCore/css/DOMWindowCSS.idl\nWebCore/css/FontLoader.idl\nWebCore/css/MediaList.idl\nWebCore/css/MediaQueryList.idl\nWebCore/css/MediaQueryListListener.idl\nWebCore/css/RGBColor.idl\nWebCore/css/Rect.idl\nWebCore/css/StyleMedia.idl\nWebCore/css/StyleSheet.idl\nWebCore/css/StyleSheetList.idl\nWebCore/css/WebKitCSSFilterValue.idl\nWebCore/css/WebKitCSSFilterRule.idl\nWebCore/css/WebKitCSSKeyframeRule.idl\nWebCore/css/WebKitCSSKeyframesRule.idl\nWebCore/css/WebKitCSSMatrix.idl\nWebCore/css/WebKitCSSMixFunctionValue.idl\nWebCore/css/WebKitCSSRegionRule.idl\nWebCore/css/WebKitCSSTransformValue.idl\nWebCore/css/WebKitCSSViewportRule.idl\nWebCore/dom/Attr.idl\nWebCore/dom/BeforeLoadEvent.idl\nWebCore/dom/CDATASection.idl\nWebCore/dom/CharacterData.idl\nWebCore/dom/ClientRect.idl\nWebCore/dom/ClientRectList.idl\nWebCore/dom/Clipboard.idl\nWebCore/dom/Comment.idl\nWebCore/dom/CompositionEvent.idl\nWebCore/dom/CustomElementConstructor.idl\nWebCore/dom/CustomEvent.idl\nWebCore/dom/DOMCoreException.idl\nWebCore/dom/DOMError.idl\nWebCore/dom/DOMImplementation.idl\nWebCore/dom/DOMStringList.idl\nWebCore/dom/DOMStringMap.idl\nWebCore/dom/DataTransferItem.idl\nWebCore/dom/DataTransferItemList.idl\nWebCore/dom/DeviceMotionEvent.idl\nWebCore/dom/DeviceOrientationEvent.idl\nWebCore/dom/Document.idl\nWebCore/dom/DocumentFragment.idl\nWebCore/dom/DocumentType.idl\nWebCore/dom/Element.idl\nWebCore/dom/Entity.idl\nWebCore/dom/EntityReference.idl\nWebCore/dom/ErrorEvent.idl\nWebCore/dom/Event.idl\nWebCore/dom/EventException.idl\nWebCore/dom/EventListener.idl\nWebCore/dom/EventTarget.idl\nWebCore/dom/FocusEvent.idl\nWebCore/dom/HashChangeEvent.idl\nWebCore/dom/KeyboardEvent.idl\nWebCore/dom/MessageChannel.idl\nWebCore/dom/MessageEvent.idl\nWebCore/dom/MessagePort.idl\nWebCore/dom/MouseEvent.idl\nWebCore/dom/MutationEvent.idl\nWebCore/dom/MutationObserver.idl\nWebCore/dom/MutationRecord.idl\nWebCore/dom/DOMNamedFlowCollection.idl\nWebCore/dom/NamedNodeMap.idl\nWebCore/dom/Node.idl\nWebCore/dom/NodeFilter.idl\nWebCore/dom/NodeIterator.idl\nWebCore/dom/NodeList.idl\nWebCore/dom/Notation.idl\nWebCore/dom/OverflowEvent.idl\nWebCore/dom/PageTransitionEvent.idl\nWebCore/dom/PopStateEvent.idl\nWebCore/dom/ProcessingInstruction.idl\nWebCore/dom/ProgressEvent.idl\nWebCore/dom/ProgressEvent.idl\nWebCore/dom/PropertyNodeList.idl\nWebCore/dom/Range.idl\nWebCore/dom/RangeException.idl\nWebCore/dom/RequestAnimationFrameCallback.idl\nWebCore/dom/ShadowRoot.idl\nWebCore/dom/StringCallback.idl\nWebCore/dom/Text.idl\nWebCore/dom/TextEvent.idl\nWebCore/dom/Touch.idl\nWebCore/dom/TouchEvent.idl\nWebCore/dom/TouchList.idl\nWebCore/dom/TransitionEvent.idl\nWebCore/dom/TreeWalker.idl\nWebCore/dom/UIEvent.idl\nWebCore/dom/WebKitAnimationEvent.idl\nWebCore/dom/WebKitNamedFlow.idl\nWebCore/dom/WebKitTransitionEvent.idl\nWebCore/dom/WheelEvent.idl\nWebCore/fileapi/Blob.idl\nWebCore/fileapi/File.idl\nWebCore/fileapi/FileError.idl\nWebCore/fileapi/FileException.idl\nWebCore/fileapi/FileList.idl\nWebCore/fileapi/FileReader.idl\nWebCore/fileapi/FileReaderSync.idl\nWebCore/html/DOMFormData.idl\nWebCore/html/DOMSettableTokenList.idl\nWebCore/html/DOMTokenList.idl\nWebCore/html/DOMURL.idl\nWebCore/html/HTMLAllCollection.idl\nWebCore/html/HTMLAnchorElement.idl\nWebCore/html/HTMLAppletElement.idl\nWebCore/html/HTMLAreaElement.idl\nWebCore/html/HTMLAudioElement.idl\nWebCore/html/HTMLBRElement.idl\nWebCore/html/HTMLBaseElement.idl\nWebCore/html/HTMLBaseFontElement.idl\nWebCore/html/HTMLBodyElement.idl\nWebCore/html/HTMLButtonElement.idl\nWebCore/html/HTMLCanvasElement.idl\nWebCore/html/HTMLCollection.idl\nWebCore/html/HTMLDListElement.idl\nWebCore/html/HTMLDataListElement.idl\nWebCore/html/HTMLDetailsElement.idl\nWebCore/html/HTMLDialogElement.idl\nWebCore/html/HTMLDirectoryElement.idl\nWebCore/html/HTMLDivElement.idl\nWebCore/html/HTMLDocument.idl\nWebCore/html/HTMLElement.idl\nWebCore/html/HTMLEmbedElement.idl\nWebCore/html/HTMLFieldSetElement.idl\nWebCore/html/HTMLFontElement.idl\nWebCore/html/HTMLFormControlsCollection.idl\nWebCore/html/HTMLFormElement.idl\nWebCore/html/HTMLFrameElement.idl\nWebCore/html/HTMLFrameSetElement.idl\nWebCore/html/HTMLHRElement.idl\nWebCore/html/HTMLHeadElement.idl\nWebCore/html/HTMLHeadingElement.idl\nWebCore/html/HTMLHtmlElement.idl\nWebCore/html/HTMLIFrameElement.idl\nWebCore/html/HTMLImageElement.idl\nWebCore/html/HTMLInputElement.idl\nWebCore/html/HTMLKeygenElement.idl\nWebCore/html/HTMLLIElement.idl\nWebCore/html/HTMLLabelElement.idl\nWebCore/html/HTMLLegendElement.idl\nWebCore/html/HTMLLinkElement.idl\nWebCore/html/HTMLMapElement.idl\nWebCore/html/HTMLMarqueeElement.idl\nWebCore/html/HTMLMediaElement.idl\nWebCore/html/HTMLMenuElement.idl\nWebCore/html/HTMLMetaElement.idl\nWebCore/html/HTMLMeterElement.idl\nWebCore/html/HTMLModElement.idl\nWebCore/html/HTMLOListElement.idl\nWebCore/html/HTMLObjectElement.idl\nWebCore/html/HTMLOptGroupElement.idl\nWebCore/html/HTMLOptionElement.idl\nWebCore/html/HTMLOptionsCollection.idl\nWebCore/html/HTMLOutputElement.idl\nWebCore/html/HTMLParagraphElement.idl\nWebCore/html/HTMLParamElement.idl\nWebCore/html/HTMLPreElement.idl\nWebCore/html/HTMLProgressElement.idl\nWebCore/html/HTMLPropertiesCollection.idl\nWebCore/html/HTMLQuoteElement.idl\nWebCore/html/HTMLScriptElement.idl\nWebCore/html/HTMLSelectElement.idl\nWebCore/html/HTMLSourceElement.idl\nWebCore/html/HTMLSpanElement.idl\nWebCore/html/HTMLStyleElement.idl\nWebCore/html/HTMLTableCaptionElement.idl\nWebCore/html/HTMLTableCellElement.idl\nWebCore/html/HTMLTableColElement.idl\nWebCore/html/HTMLTableElement.idl\nWebCore/html/HTMLTableRowElement.idl\nWebCore/html/HTMLTableSectionElement.idl\nWebCore/html/HTMLTemplateElement.idl\nWebCore/html/HTMLTextAreaElement.idl\nWebCore/html/HTMLTitleElement.idl\nWebCore/html/HTMLTrackElement.idl\nWebCore/html/HTMLUListElement.idl\nWebCore/html/HTMLUnknownElement.idl\nWebCore/html/HTMLVideoElement.idl\nWebCore/html/ImageData.idl\nWebCore/html/MediaController.idl\nWebCore/html/MediaError.idl\nWebCore/html/MediaKeyError.idl\nWebCore/html/MediaKeyEvent.idl\nWebCore/html/MicroDataItemValue.idl\nWebCore/html/RadioNodeList.idl\nWebCore/html/TextMetrics.idl\nWebCore/html/TimeRanges.idl\nWebCore/html/ValidityState.idl\nWebCore/html/VoidCallback.idl\nWebCore/html/canvas/ArrayBuffer.idl\nWebCore/html/canvas/ArrayBufferView.idl\nWebCore/html/canvas/CanvasGradient.idl\nWebCore/html/canvas/CanvasPattern.idl\nWebCore/html/canvas/CanvasProxy.idl\nWebCore/html/canvas/CanvasRenderingContext.idl\nWebCore/html/canvas/CanvasRenderingContext2D.idl\nWebCore/html/canvas/DataView.idl\nWebCore/html/canvas/DOMPath.idl\nWebCore/html/canvas/EXTDrawBuffers.idl\nWebCore/html/canvas/EXTTextureFilterAnisotropic.idl\nWebCore/html/canvas/Float32Array.idl\nWebCore/html/canvas/Float64Array.idl\nWebCore/html/canvas/Int16Array.idl\nWebCore/html/canvas/Int32Array.idl\nWebCore/html/canvas/Int8Array.idl\nWebCore/html/canvas/OESElementIndexUint.idl\nWebCore/html/canvas/OESStandardDerivatives.idl\nWebCore/html/canvas/OESTextureFloat.idl\nWebCore/html/canvas/OESTextureHalfFloat.idl\nWebCore/html/canvas/OESVertexArrayObject.idl\nWebCore/html/canvas/Uint16Array.idl\nWebCore/html/canvas/Uint32Array.idl\nWebCore/html/canvas/Uint8Array.idl\nWebCore/html/canvas/Uint8ClampedArray.idl\nWebCore/html/canvas/WebGLActiveInfo.idl\nWebCore/html/canvas/WebGLBuffer.idl\nWebCore/html/canvas/WebGLCompressedTextureATC.idl\nWebCore/html/canvas/WebGLCompressedTexturePVRTC.idl\nWebCore/html/canvas/WebGLCompressedTextureS3TC.idl\nWebCore/html/canvas/WebGLContextAttributes.idl\nWebCore/html/canvas/WebGLContextEvent.idl\nWebCore/html/canvas/WebGLDepthTexture.idl\nWebCore/html/canvas/WebGLFramebuffer.idl\nWebCore/html/canvas/WebGLLoseContext.idl\nWebCore/html/canvas/WebGLProgram.idl\nWebCore/html/canvas/WebGLRenderbuffer.idl\nWebCore/html/canvas/WebGLRenderingContext.idl\nWebCore/html/canvas/WebGLShader.idl\nWebCore/html/canvas/WebGLShaderPrecisionFormat.idl\nWebCore/html/canvas/WebGLTexture.idl\nWebCore/html/canvas/WebGLUniformLocation.idl\nWebCore/html/canvas/WebGLVertexArrayObjectOES.idl\nWebCore/html/shadow/HTMLContentElement.idl\nWebCore/html/shadow/HTMLShadowElement.idl\nWebCore/html/track/TextTrack.idl\nWebCore/html/track/TextTrackCue.idl\nWebCore/html/track/TextTrackCueList.idl\nWebCore/html/track/TextTrackList.idl\nWebCore/html/track/TrackEvent.idl\nWebCore/inspector/InjectedScriptHost.idl\nWebCore/inspector/InspectorFrontendHost.idl\nWebCore/inspector/ScriptProfile.idl\nWebCore/inspector/ScriptProfileNode.idl\nWebCore/loader/appcache/DOMApplicationCache.idl\nWebCore/page/AbstractView.idl\nWebCore/page/BarInfo.idl\nWebCore/page/Console.idl\nWebCore/page/Crypto.idl\nWebCore/page/DOMSecurityPolicy.idl\nWebCore/page/DOMSelection.idl\nWebCore/page/DOMWindow.idl\nWebCore/page/EventSource.idl\nWebCore/page/History.idl\nWebCore/page/Location.idl\nWebCore/page/MemoryInfo.idl\nWebCore/page/Navigator.idl\nWebCore/page/Performance.idl\nWebCore/page/PerformanceNavigation.idl\nWebCore/page/PerformanceTiming.idl\nWebCore/page/Screen.idl\nWebCore/page/SpeechInputEvent.idl\nWebCore/page/SpeechInputResult.idl\nWebCore/page/SpeechInputResultList.idl\nWebCore/page/WebKitPoint.idl\nWebCore/page/WorkerNavigator.idl\nWebCore/plugins/DOMMimeType.idl\nWebCore/plugins/DOMMimeTypeArray.idl\nWebCore/plugins/DOMPlugin.idl\nWebCore/plugins/DOMPluginArray.idl\nWebCore/storage/Storage.idl\nWebCore/storage/StorageEvent.idl\nWebCore/svg/ElementTimeControl.idl\nWebCore/svg/SVGAElement.idl\nWebCore/svg/SVGAltGlyphDefElement.idl\nWebCore/svg/SVGAltGlyphElement.idl\nWebCore/svg/SVGAltGlyphItemElement.idl\nWebCore/svg/SVGAngle.idl\nWebCore/svg/SVGAnimateColorElement.idl\nWebCore/svg/SVGAnimateElement.idl\nWebCore/svg/SVGAnimateMotionElement.idl\nWebCore/svg/SVGAnimateTransformElement.idl\nWebCore/svg/SVGAnimatedAngle.idl\nWebCore/svg/SVGAnimatedBoolean.idl\nWebCore/svg/SVGAnimatedEnumeration.idl\nWebCore/svg/SVGAnimatedInteger.idl\nWebCore/svg/SVGAnimatedLength.idl\nWebCore/svg/SVGAnimatedLengthList.idl\nWebCore/svg/SVGAnimatedNumber.idl\nWebCore/svg/SVGAnimatedNumberList.idl\nWebCore/svg/SVGAnimatedPreserveAspectRatio.idl\nWebCore/svg/SVGAnimatedRect.idl\nWebCore/svg/SVGAnimatedString.idl\nWebCore/svg/SVGAnimatedTransformList.idl\nWebCore/svg/SVGAnimationElement.idl\nWebCore/svg/SVGCircleElement.idl\nWebCore/svg/SVGClipPathElement.idl\nWebCore/svg/SVGColor.idl\nWebCore/svg/SVGComponentTransferFunctionElement.idl\nWebCore/svg/SVGCursorElement.idl\nWebCore/svg/SVGDefsElement.idl\nWebCore/svg/SVGDescElement.idl\nWebCore/svg/SVGDocument.idl\nWebCore/svg/SVGElement.idl\nWebCore/svg/SVGElementInstance.idl\nWebCore/svg/SVGElementInstanceList.idl\nWebCore/svg/SVGEllipseElement.idl\nWebCore/svg/SVGException.idl\nWebCore/svg/SVGExternalResourcesRequired.idl\nWebCore/svg/SVGFEBlendElement.idl\nWebCore/svg/SVGFEColorMatrixElement.idl\nWebCore/svg/SVGFEComponentTransferElement.idl\nWebCore/svg/SVGFECompositeElement.idl\nWebCore/svg/SVGFEConvolveMatrixElement.idl\nWebCore/svg/SVGFEDiffuseLightingElement.idl\nWebCore/svg/SVGFEDisplacementMapElement.idl\nWebCore/svg/SVGFEDistantLightElement.idl\nWebCore/svg/SVGFEDropShadowElement.idl\nWebCore/svg/SVGFEFloodElement.idl\nWebCore/svg/SVGFEFuncAElement.idl\nWebCore/svg/SVGFEFuncBElement.idl\nWebCore/svg/SVGFEFuncGElement.idl\nWebCore/svg/SVGFEFuncRElement.idl\nWebCore/svg/SVGFEGaussianBlurElement.idl\nWebCore/svg/SVGFEImageElement.idl\nWebCore/svg/SVGFEMergeElement.idl\nWebCore/svg/SVGFEMergeNodeElement.idl\nWebCore/svg/SVGFEMorphologyElement.idl\nWebCore/svg/SVGFEOffsetElement.idl\nWebCore/svg/SVGFEPointLightElement.idl\nWebCore/svg/SVGFESpecularLightingElement.idl\nWebCore/svg/SVGFESpotLightElement.idl\nWebCore/svg/SVGFETileElement.idl\nWebCore/svg/SVGFETurbulenceElement.idl\nWebCore/svg/SVGFilterElement.idl\nWebCore/svg/SVGFilterPrimitiveStandardAttributes.idl\nWebCore/svg/SVGFitToViewBox.idl\nWebCore/svg/SVGFontElement.idl\nWebCore/svg/SVGFontFaceElement.idl\nWebCore/svg/SVGFontFaceFormatElement.idl\nWebCore/svg/SVGFontFaceNameElement.idl\nWebCore/svg/SVGFontFaceSrcElement.idl\nWebCore/svg/SVGFontFaceUriElement.idl\nWebCore/svg/SVGForeignObjectElement.idl\nWebCore/svg/SVGGElement.idl\nWebCore/svg/SVGGlyphElement.idl\nWebCore/svg/SVGGlyphRefElement.idl\nWebCore/svg/SVGGradientElement.idl\nWebCore/svg/SVGHKernElement.idl\nWebCore/svg/SVGImageElement.idl\nWebCore/svg/SVGLangSpace.idl\nWebCore/svg/SVGLength.idl\nWebCore/svg/SVGLengthList.idl\nWebCore/svg/SVGLineElement.idl\nWebCore/svg/SVGLinearGradientElement.idl\nWebCore/svg/SVGLocatable.idl\nWebCore/svg/SVGMPathElement.idl\nWebCore/svg/SVGMarkerElement.idl\nWebCore/svg/SVGMaskElement.idl\nWebCore/svg/SVGMatrix.idl\nWebCore/svg/SVGMetadataElement.idl\nWebCore/svg/SVGMissingGlyphElement.idl\nWebCore/svg/SVGNumber.idl\nWebCore/svg/SVGNumberList.idl\nWebCore/svg/SVGPaint.idl\nWebCore/svg/SVGPathElement.idl\nWebCore/svg/SVGPathSeg.idl\nWebCore/svg/SVGPathSegArcAbs.idl\nWebCore/svg/SVGPathSegArcRel.idl\nWebCore/svg/SVGPathSegClosePath.idl\nWebCore/svg/SVGPathSegCurvetoCubicAbs.idl\nWebCore/svg/SVGPathSegCurvetoCubicRel.idl\nWebCore/svg/SVGPathSegCurvetoCubicSmoothAbs.idl\nWebCore/svg/SVGPathSegCurvetoCubicSmoothRel.idl\nWebCore/svg/SVGPathSegCurvetoQuadraticAbs.idl\nWebCore/svg/SVGPathSegCurvetoQuadraticRel.idl\nWebCore/svg/SVGPathSegCurvetoQuadraticSmoothAbs.idl\nWebCore/svg/SVGPathSegCurvetoQuadraticSmoothRel.idl\nWebCore/svg/SVGPathSegLinetoAbs.idl\nWebCore/svg/SVGPathSegLinetoHorizontalAbs.idl\nWebCore/svg/SVGPathSegLinetoHorizontalRel.idl\nWebCore/svg/SVGPathSegLinetoRel.idl\nWebCore/svg/SVGPathSegLinetoVerticalAbs.idl\nWebCore/svg/SVGPathSegLinetoVerticalRel.idl\nWebCore/svg/SVGPathSegList.idl\nWebCore/svg/SVGPathSegMovetoAbs.idl\nWebCore/svg/SVGPathSegMovetoRel.idl\nWebCore/svg/SVGPatternElement.idl\nWebCore/svg/SVGPoint.idl\nWebCore/svg/SVGPointList.idl\nWebCore/svg/SVGPolygonElement.idl\nWebCore/svg/SVGPolylineElement.idl\nWebCore/svg/SVGPreserveAspectRatio.idl\nWebCore/svg/SVGRadialGradientElement.idl\nWebCore/svg/SVGRect.idl\nWebCore/svg/SVGRectElement.idl\nWebCore/svg/SVGRenderingIntent.idl\nWebCore/svg/SVGSVGElement.idl\nWebCore/svg/SVGScriptElement.idl\nWebCore/svg/SVGSetElement.idl\nWebCore/svg/SVGStopElement.idl\nWebCore/svg/SVGStringList.idl\nWebCore/svg/SVGStyleElement.idl\nWebCore/svg/SVGStyledElement.idl\nWebCore/svg/SVGSwitchElement.idl\nWebCore/svg/SVGSymbolElement.idl\nWebCore/svg/SVGTRefElement.idl\nWebCore/svg/SVGTSpanElement.idl\nWebCore/svg/SVGTests.idl\nWebCore/svg/SVGTextContentElement.idl\nWebCore/svg/SVGTextElement.idl\nWebCore/svg/SVGTextPathElement.idl\nWebCore/svg/SVGTextPositioningElement.idl\nWebCore/svg/SVGTitleElement.idl\nWebCore/svg/SVGTransform.idl\nWebCore/svg/SVGTransformList.idl\nWebCore/svg/SVGTransformable.idl\nWebCore/svg/SVGURIReference.idl\nWebCore/svg/SVGUnitTypes.idl\nWebCore/svg/SVGUseElement.idl\nWebCore/svg/SVGVKernElement.idl\nWebCore/svg/SVGViewElement.idl\nWebCore/svg/SVGViewSpec.idl\nWebCore/svg/SVGZoomAndPan.idl\nWebCore/svg/SVGZoomEvent.idl\nWebCore/testing/Internals.idl\nWebCore/testing/InternalSettings.idl\nWebCore/testing/MallocStatistics.idl\nWebCore/testing/TypeConversions.idl\nWebCore/workers/AbstractWorker.idl\nWebCore/workers/DedicatedWorkerContext.idl\nWebCore/workers/SharedWorker.idl\nWebCore/workers/SharedWorkerContext.idl\nWebCore/workers/Worker.idl\nWebCore/workers/WorkerContext.idl\nWebCore/workers/WorkerLocation.idl\nWebCore/xml/DOMParser.idl\nWebCore/xml/XMLHttpRequest.idl\nWebCore/xml/XMLHttpRequestException.idl\nWebCore/xml/XMLHttpRequestProgressEvent.idl\nWebCore/xml/XMLHttpRequestUpload.idl\nWebCore/xml/XMLSerializer.idl\nWebCore/xml/XPathEvaluator.idl\nWebCore/xml/XPathException.idl\nWebCore/xml/XPathExpression.idl\nWebCore/xml/XPathNSResolver.idl\nWebCore/xml/XPathResult.idl\nWebCore/xml/XSLTProcessor.idl\nInternalSettingsGenerated.idl\nWebCore/inspector/JavaScriptCallFrame.idl\n" > ./idl_files.tmp +printf "WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.idl\nWebCore/Modules/encryptedmedia/MediaKeyNeededEvent.idl\nWebCore/Modules/encryptedmedia/MediaKeySession.idl\nWebCore/Modules/encryptedmedia/MediaKeys.idl\nWebCore/Modules/filesystem/DOMFileSystem.idl\nWebCore/Modules/filesystem/DOMFileSystemSync.idl\nWebCore/Modules/filesystem/DOMWindowFileSystem.idl\nWebCore/Modules/filesystem/DirectoryEntry.idl\nWebCore/Modules/filesystem/DirectoryEntrySync.idl\nWebCore/Modules/filesystem/DirectoryReader.idl\nWebCore/Modules/filesystem/DirectoryReaderSync.idl\nWebCore/Modules/filesystem/EntriesCallback.idl\nWebCore/Modules/filesystem/Entry.idl\nWebCore/Modules/filesystem/EntryArray.idl\nWebCore/Modules/filesystem/EntryArraySync.idl\nWebCore/Modules/filesystem/EntryCallback.idl\nWebCore/Modules/filesystem/EntrySync.idl\nWebCore/Modules/filesystem/ErrorCallback.idl\nWebCore/Modules/filesystem/FileCallback.idl\nWebCore/Modules/filesystem/FileEntry.idl\nWebCore/Modules/filesystem/FileEntrySync.idl\nWebCore/Modules/filesystem/FileSystemCallback.idl\nWebCore/Modules/filesystem/FileWriter.idl\nWebCore/Modules/filesystem/FileWriterCallback.idl\nWebCore/Modules/filesystem/FileWriterSync.idl\nWebCore/Modules/filesystem/Metadata.idl\nWebCore/Modules/filesystem/MetadataCallback.idl\nWebCore/Modules/filesystem/WorkerContextFileSystem.idl\nWebCore/Modules/geolocation/Coordinates.idl\nWebCore/Modules/geolocation/Geolocation.idl\nWebCore/Modules/geolocation/Geoposition.idl\nWebCore/Modules/geolocation/NavigatorGeolocation.idl\nWebCore/Modules/geolocation/PositionCallback.idl\nWebCore/Modules/geolocation/PositionError.idl\nWebCore/Modules/geolocation/PositionErrorCallback.idl\nWebCore/Modules/indexeddb/DOMWindowIndexedDatabase.idl\nWebCore/Modules/indexeddb/IDBAny.idl\nWebCore/Modules/indexeddb/IDBCursor.idl\nWebCore/Modules/indexeddb/IDBDatabase.idl\nWebCore/Modules/indexeddb/IDBFactory.idl\nWebCore/Modules/indexeddb/IDBIndex.idl\nWebCore/Modules/indexeddb/IDBKeyRange.idl\nWebCore/Modules/indexeddb/IDBObjectStore.idl\nWebCore/Modules/indexeddb/IDBRequest.idl\nWebCore/Modules/indexeddb/IDBTransaction.idl\nWebCore/Modules/indexeddb/IDBVersionChangeEvent.idl\nWebCore/Modules/indexeddb/WorkerContextIndexedDatabase.idl\nWebCore/Modules/mediasource/MediaSource.idl\nWebCore/Modules/mediasource/SourceBuffer.idl\nWebCore/Modules/mediasource/SourceBufferList.idl\nWebCore/Modules/notifications/DOMWindowNotifications.idl\nWebCore/Modules/notifications/Notification.idl\nWebCore/Modules/notifications/NotificationCenter.idl\nWebCore/Modules/notifications/NotificationPermissionCallback.idl\nWebCore/Modules/notifications/WorkerContextNotifications.idl\nWebCore/Modules/quota/DOMWindowQuota.idl\nWebCore/Modules/quota/NavigatorStorageQuota.idl\nWebCore/Modules/quota/StorageInfo.idl\nWebCore/Modules/quota/StorageErrorCallback.idl\nWebCore/Modules/quota/StorageQuota.idl\nWebCore/Modules/quota/StorageQuotaCallback.idl\nWebCore/Modules/quota/StorageUsageCallback.idl\nWebCore/Modules/quota/WorkerNavigatorStorageQuota.idl\nWebCore/Modules/speech/DOMWindowSpeechSynthesis.idl\nWebCore/Modules/speech/SpeechSynthesis.idl\nWebCore/Modules/speech/SpeechSynthesisEvent.idl\nWebCore/Modules/speech/SpeechSynthesisUtterance.idl\nWebCore/Modules/speech/SpeechSynthesisVoice.idl\nWebCore/Modules/webaudio/AudioBuffer.idl\nWebCore/Modules/webaudio/AudioBufferCallback.idl\nWebCore/Modules/webaudio/AudioBufferSourceNode.idl\nWebCore/Modules/webaudio/ChannelMergerNode.idl\nWebCore/Modules/webaudio/ChannelSplitterNode.idl\nWebCore/Modules/webaudio/AudioContext.idl\nWebCore/Modules/webaudio/AudioDestinationNode.idl\nWebCore/Modules/webaudio/GainNode.idl\nWebCore/Modules/webaudio/AudioListener.idl\nWebCore/Modules/webaudio/AudioNode.idl\nWebCore/Modules/webaudio/PannerNode.idl\nWebCore/Modules/webaudio/AudioParam.idl\nWebCore/Modules/webaudio/AudioProcessingEvent.idl\nWebCore/Modules/webaudio/BiquadFilterNode.idl\nWebCore/Modules/webaudio/ConvolverNode.idl\nWebCore/Modules/webaudio/DOMWindowWebAudio.idl\nWebCore/Modules/webaudio/DelayNode.idl\nWebCore/Modules/webaudio/DynamicsCompressorNode.idl\nWebCore/Modules/webaudio/ScriptProcessorNode.idl\nWebCore/Modules/webaudio/MediaElementAudioSourceNode.idl\nWebCore/Modules/webaudio/MediaStreamAudioSourceNode.idl\nWebCore/Modules/webaudio/OscillatorNode.idl\nWebCore/Modules/webaudio/OfflineAudioContext.idl\nWebCore/Modules/webaudio/OfflineAudioCompletionEvent.idl\nWebCore/Modules/webaudio/AnalyserNode.idl\nWebCore/Modules/webaudio/WaveShaperNode.idl\nWebCore/Modules/webaudio/WaveTable.idl\nWebCore/Modules/webdatabase/DOMWindowWebDatabase.idl\nWebCore/Modules/webdatabase/Database.idl\nWebCore/Modules/webdatabase/DatabaseCallback.idl\nWebCore/Modules/webdatabase/DatabaseSync.idl\nWebCore/Modules/webdatabase/SQLError.idl\nWebCore/Modules/webdatabase/SQLException.idl\nWebCore/Modules/webdatabase/SQLResultSet.idl\nWebCore/Modules/webdatabase/SQLResultSetRowList.idl\nWebCore/Modules/webdatabase/SQLStatementCallback.idl\nWebCore/Modules/webdatabase/SQLStatementErrorCallback.idl\nWebCore/Modules/webdatabase/SQLTransaction.idl\nWebCore/Modules/webdatabase/SQLTransactionCallback.idl\nWebCore/Modules/webdatabase/SQLTransactionErrorCallback.idl\nWebCore/Modules/webdatabase/SQLTransactionSync.idl\nWebCore/Modules/webdatabase/SQLTransactionSyncCallback.idl\nWebCore/Modules/webdatabase/WorkerContextWebDatabase.idl\nWebCore/Modules/websockets/CloseEvent.idl\nWebCore/Modules/websockets/DOMWindowWebSocket.idl\nWebCore/Modules/websockets/WebSocket.idl\nWebCore/Modules/websockets/WorkerContextWebSocket.idl\nWebCore/css/CSSCharsetRule.idl\nWebCore/css/CSSFontFaceLoadEvent.idl\nWebCore/css/CSSFontFaceRule.idl\nWebCore/css/CSSHostRule.idl\nWebCore/css/CSSImportRule.idl\nWebCore/css/CSSMediaRule.idl\nWebCore/css/CSSPageRule.idl\nWebCore/css/CSSPrimitiveValue.idl\nWebCore/css/CSSRule.idl\nWebCore/css/CSSRuleList.idl\nWebCore/css/CSSStyleDeclaration.idl\nWebCore/css/CSSStyleRule.idl\nWebCore/css/CSSStyleSheet.idl\nWebCore/css/CSSSupportsRule.idl\nWebCore/css/CSSUnknownRule.idl\nWebCore/css/CSSValue.idl\nWebCore/css/CSSValueList.idl\nWebCore/css/Counter.idl\nWebCore/css/DOMWindowCSS.idl\nWebCore/css/FontLoader.idl\nWebCore/css/MediaList.idl\nWebCore/css/MediaQueryList.idl\nWebCore/css/MediaQueryListListener.idl\nWebCore/css/RGBColor.idl\nWebCore/css/Rect.idl\nWebCore/css/StyleMedia.idl\nWebCore/css/StyleSheet.idl\nWebCore/css/StyleSheetList.idl\nWebCore/css/WebKitCSSFilterValue.idl\nWebCore/css/WebKitCSSFilterRule.idl\nWebCore/css/WebKitCSSKeyframeRule.idl\nWebCore/css/WebKitCSSKeyframesRule.idl\nWebCore/css/WebKitCSSMatrix.idl\nWebCore/css/WebKitCSSMixFunctionValue.idl\nWebCore/css/WebKitCSSRegionRule.idl\nWebCore/css/WebKitCSSTransformValue.idl\nWebCore/css/WebKitCSSViewportRule.idl\nWebCore/dom/Attr.idl\nWebCore/dom/BeforeLoadEvent.idl\nWebCore/dom/CDATASection.idl\nWebCore/dom/CharacterData.idl\nWebCore/dom/ClientRect.idl\nWebCore/dom/ClientRectList.idl\nWebCore/dom/Clipboard.idl\nWebCore/dom/Comment.idl\nWebCore/dom/CompositionEvent.idl\nWebCore/dom/CustomElementConstructor.idl\nWebCore/dom/CustomEvent.idl\nWebCore/dom/DOMCoreException.idl\nWebCore/dom/DOMError.idl\nWebCore/dom/DOMImplementation.idl\nWebCore/dom/DOMStringList.idl\nWebCore/dom/DOMStringMap.idl\nWebCore/dom/DataTransferItem.idl\nWebCore/dom/DataTransferItemList.idl\nWebCore/dom/DeviceMotionEvent.idl\nWebCore/dom/DeviceOrientationEvent.idl\nWebCore/dom/Document.idl\nWebCore/dom/DocumentFragment.idl\nWebCore/dom/DocumentType.idl\nWebCore/dom/Element.idl\nWebCore/dom/Entity.idl\nWebCore/dom/EntityReference.idl\nWebCore/dom/ErrorEvent.idl\nWebCore/dom/Event.idl\nWebCore/dom/EventException.idl\nWebCore/dom/EventListener.idl\nWebCore/dom/EventTarget.idl\nWebCore/dom/FocusEvent.idl\nWebCore/dom/HashChangeEvent.idl\nWebCore/dom/KeyboardEvent.idl\nWebCore/dom/MessageChannel.idl\nWebCore/dom/MessageEvent.idl\nWebCore/dom/MessagePort.idl\nWebCore/dom/MouseEvent.idl\nWebCore/dom/MutationEvent.idl\nWebCore/dom/MutationObserver.idl\nWebCore/dom/MutationRecord.idl\nWebCore/dom/DOMNamedFlowCollection.idl\nWebCore/dom/NamedNodeMap.idl\nWebCore/dom/Node.idl\nWebCore/dom/NodeFilter.idl\nWebCore/dom/NodeIterator.idl\nWebCore/dom/NodeList.idl\nWebCore/dom/Notation.idl\nWebCore/dom/OverflowEvent.idl\nWebCore/dom/PageTransitionEvent.idl\nWebCore/dom/PopStateEvent.idl\nWebCore/dom/ProcessingInstruction.idl\nWebCore/dom/ProgressEvent.idl\nWebCore/dom/ProgressEvent.idl\nWebCore/dom/PropertyNodeList.idl\nWebCore/dom/Range.idl\nWebCore/dom/RangeException.idl\nWebCore/dom/RequestAnimationFrameCallback.idl\nWebCore/dom/ShadowRoot.idl\nWebCore/dom/StringCallback.idl\nWebCore/dom/Text.idl\nWebCore/dom/TextEvent.idl\nWebCore/dom/Touch.idl\nWebCore/dom/TouchEvent.idl\nWebCore/dom/TouchList.idl\nWebCore/dom/TransitionEvent.idl\nWebCore/dom/TreeWalker.idl\nWebCore/dom/UIEvent.idl\nWebCore/dom/WebKitAnimationEvent.idl\nWebCore/dom/WebKitNamedFlow.idl\nWebCore/dom/WebKitTransitionEvent.idl\nWebCore/dom/WheelEvent.idl\nWebCore/fileapi/Blob.idl\nWebCore/fileapi/File.idl\nWebCore/fileapi/FileError.idl\nWebCore/fileapi/FileException.idl\nWebCore/fileapi/FileList.idl\nWebCore/fileapi/FileReader.idl\nWebCore/fileapi/FileReaderSync.idl\nWebCore/html/DOMFormData.idl\nWebCore/html/DOMSettableTokenList.idl\nWebCore/html/DOMTokenList.idl\nWebCore/html/DOMURL.idl\nWebCore/html/HTMLAllCollection.idl\nWebCore/html/HTMLAnchorElement.idl\nWebCore/html/HTMLAppletElement.idl\nWebCore/html/HTMLAreaElement.idl\nWebCore/html/HTMLAudioElement.idl\nWebCore/html/HTMLBRElement.idl\nWebCore/html/HTMLBaseElement.idl\nWebCore/html/HTMLBaseFontElement.idl\nWebCore/html/HTMLBodyElement.idl\nWebCore/html/HTMLButtonElement.idl\nWebCore/html/HTMLCanvasElement.idl\nWebCore/html/HTMLCollection.idl\nWebCore/html/HTMLDListElement.idl\nWebCore/html/HTMLDataListElement.idl\nWebCore/html/HTMLDetailsElement.idl\nWebCore/html/HTMLDialogElement.idl\nWebCore/html/HTMLDirectoryElement.idl\nWebCore/html/HTMLDivElement.idl\nWebCore/html/HTMLDocument.idl\nWebCore/html/HTMLElement.idl\nWebCore/html/HTMLEmbedElement.idl\nWebCore/html/HTMLFieldSetElement.idl\nWebCore/html/HTMLFontElement.idl\nWebCore/html/HTMLFormControlsCollection.idl\nWebCore/html/HTMLFormElement.idl\nWebCore/html/HTMLFrameElement.idl\nWebCore/html/HTMLFrameSetElement.idl\nWebCore/html/HTMLHRElement.idl\nWebCore/html/HTMLHeadElement.idl\nWebCore/html/HTMLHeadingElement.idl\nWebCore/html/HTMLHtmlElement.idl\nWebCore/html/HTMLIFrameElement.idl\nWebCore/html/HTMLImageElement.idl\nWebCore/html/HTMLInputElement.idl\nWebCore/html/HTMLKeygenElement.idl\nWebCore/html/HTMLLIElement.idl\nWebCore/html/HTMLLabelElement.idl\nWebCore/html/HTMLLegendElement.idl\nWebCore/html/HTMLLinkElement.idl\nWebCore/html/HTMLMapElement.idl\nWebCore/html/HTMLMarqueeElement.idl\nWebCore/html/HTMLMediaElement.idl\nWebCore/html/HTMLMenuElement.idl\nWebCore/html/HTMLMetaElement.idl\nWebCore/html/HTMLMeterElement.idl\nWebCore/html/HTMLModElement.idl\nWebCore/html/HTMLOListElement.idl\nWebCore/html/HTMLObjectElement.idl\nWebCore/html/HTMLOptGroupElement.idl\nWebCore/html/HTMLOptionElement.idl\nWebCore/html/HTMLOptionsCollection.idl\nWebCore/html/HTMLOutputElement.idl\nWebCore/html/HTMLParagraphElement.idl\nWebCore/html/HTMLParamElement.idl\nWebCore/html/HTMLPreElement.idl\nWebCore/html/HTMLProgressElement.idl\nWebCore/html/HTMLPropertiesCollection.idl\nWebCore/html/HTMLQuoteElement.idl\nWebCore/html/HTMLScriptElement.idl\nWebCore/html/HTMLSelectElement.idl\nWebCore/html/HTMLSourceElement.idl\nWebCore/html/HTMLSpanElement.idl\nWebCore/html/HTMLStyleElement.idl\nWebCore/html/HTMLTableCaptionElement.idl\nWebCore/html/HTMLTableCellElement.idl\nWebCore/html/HTMLTableColElement.idl\nWebCore/html/HTMLTableElement.idl\nWebCore/html/HTMLTableRowElement.idl\nWebCore/html/HTMLTableSectionElement.idl\nWebCore/html/HTMLTemplateElement.idl\nWebCore/html/HTMLTextAreaElement.idl\nWebCore/html/HTMLTitleElement.idl\nWebCore/html/HTMLTrackElement.idl\nWebCore/html/HTMLUListElement.idl\nWebCore/html/HTMLUnknownElement.idl\nWebCore/html/HTMLVideoElement.idl\nWebCore/html/ImageData.idl\nWebCore/html/MediaController.idl\nWebCore/html/MediaError.idl\nWebCore/html/MediaKeyError.idl\nWebCore/html/MediaKeyEvent.idl\nWebCore/html/MicroDataItemValue.idl\nWebCore/html/RadioNodeList.idl\nWebCore/html/TextMetrics.idl\nWebCore/html/TimeRanges.idl\nWebCore/html/ValidityState.idl\nWebCore/html/VoidCallback.idl\nWebCore/html/canvas/ArrayBuffer.idl\nWebCore/html/canvas/ArrayBufferView.idl\nWebCore/html/canvas/CanvasGradient.idl\nWebCore/html/canvas/CanvasPattern.idl\nWebCore/html/canvas/CanvasProxy.idl\nWebCore/html/canvas/CanvasRenderingContext.idl\nWebCore/html/canvas/CanvasRenderingContext2D.idl\nWebCore/html/canvas/DataView.idl\nWebCore/html/canvas/DOMPath.idl\nWebCore/html/canvas/EXTDrawBuffers.idl\nWebCore/html/canvas/EXTTextureFilterAnisotropic.idl\nWebCore/html/canvas/Float32Array.idl\nWebCore/html/canvas/Float64Array.idl\nWebCore/html/canvas/Int16Array.idl\nWebCore/html/canvas/Int32Array.idl\nWebCore/html/canvas/Int8Array.idl\nWebCore/html/canvas/OESElementIndexUint.idl\nWebCore/html/canvas/OESStandardDerivatives.idl\nWebCore/html/canvas/OESTextureFloat.idl\nWebCore/html/canvas/OESTextureHalfFloat.idl\nWebCore/html/canvas/OESVertexArrayObject.idl\nWebCore/html/canvas/Uint16Array.idl\nWebCore/html/canvas/Uint32Array.idl\nWebCore/html/canvas/Uint8Array.idl\nWebCore/html/canvas/Uint8ClampedArray.idl\nWebCore/html/canvas/WebGLActiveInfo.idl\nWebCore/html/canvas/WebGLBuffer.idl\nWebCore/html/canvas/WebGLCompressedTextureATC.idl\nWebCore/html/canvas/WebGLCompressedTexturePVRTC.idl\nWebCore/html/canvas/WebGLCompressedTextureS3TC.idl\nWebCore/html/canvas/WebGLContextAttributes.idl\nWebCore/html/canvas/WebGLContextEvent.idl\nWebCore/html/canvas/WebGLDepthTexture.idl\nWebCore/html/canvas/WebGLFramebuffer.idl\nWebCore/html/canvas/WebGLLoseContext.idl\nWebCore/html/canvas/WebGLProgram.idl\nWebCore/html/canvas/WebGLRenderbuffer.idl\nWebCore/html/canvas/WebGLRenderingContext.idl\nWebCore/html/canvas/WebGLShader.idl\nWebCore/html/canvas/WebGLShaderPrecisionFormat.idl\nWebCore/html/canvas/WebGLTexture.idl\nWebCore/html/canvas/WebGLUniformLocation.idl\nWebCore/html/canvas/WebGLVertexArrayObjectOES.idl\nWebCore/html/shadow/HTMLContentElement.idl\nWebCore/html/shadow/HTMLShadowElement.idl\nWebCore/html/track/TextTrack.idl\nWebCore/html/track/TextTrackCue.idl\nWebCore/html/track/TextTrackCueList.idl\nWebCore/html/track/TextTrackList.idl\nWebCore/html/track/TrackEvent.idl\nWebCore/inspector/InjectedScriptHost.idl\nWebCore/inspector/InspectorFrontendHost.idl\nWebCore/inspector/ScriptProfile.idl\nWebCore/inspector/ScriptProfileNode.idl\nWebCore/loader/appcache/DOMApplicationCache.idl\nWebCore/page/AbstractView.idl\nWebCore/page/BarInfo.idl\nWebCore/page/Console.idl\nWebCore/page/Crypto.idl\nWebCore/page/DOMSecurityPolicy.idl\nWebCore/page/DOMSelection.idl\nWebCore/page/DOMWindow.idl\nWebCore/page/EventSource.idl\nWebCore/page/History.idl\nWebCore/page/Location.idl\nWebCore/page/Navigator.idl\nWebCore/page/Performance.idl\nWebCore/page/PerformanceNavigation.idl\nWebCore/page/PerformanceTiming.idl\nWebCore/page/Screen.idl\nWebCore/page/SpeechInputEvent.idl\nWebCore/page/SpeechInputResult.idl\nWebCore/page/SpeechInputResultList.idl\nWebCore/page/WebKitPoint.idl\nWebCore/page/WorkerNavigator.idl\nWebCore/plugins/DOMMimeType.idl\nWebCore/plugins/DOMMimeTypeArray.idl\nWebCore/plugins/DOMPlugin.idl\nWebCore/plugins/DOMPluginArray.idl\nWebCore/storage/Storage.idl\nWebCore/storage/StorageEvent.idl\nWebCore/svg/ElementTimeControl.idl\nWebCore/svg/SVGAElement.idl\nWebCore/svg/SVGAltGlyphDefElement.idl\nWebCore/svg/SVGAltGlyphElement.idl\nWebCore/svg/SVGAltGlyphItemElement.idl\nWebCore/svg/SVGAngle.idl\nWebCore/svg/SVGAnimateColorElement.idl\nWebCore/svg/SVGAnimateElement.idl\nWebCore/svg/SVGAnimateMotionElement.idl\nWebCore/svg/SVGAnimateTransformElement.idl\nWebCore/svg/SVGAnimatedAngle.idl\nWebCore/svg/SVGAnimatedBoolean.idl\nWebCore/svg/SVGAnimatedEnumeration.idl\nWebCore/svg/SVGAnimatedInteger.idl\nWebCore/svg/SVGAnimatedLength.idl\nWebCore/svg/SVGAnimatedLengthList.idl\nWebCore/svg/SVGAnimatedNumber.idl\nWebCore/svg/SVGAnimatedNumberList.idl\nWebCore/svg/SVGAnimatedPreserveAspectRatio.idl\nWebCore/svg/SVGAnimatedRect.idl\nWebCore/svg/SVGAnimatedString.idl\nWebCore/svg/SVGAnimatedTransformList.idl\nWebCore/svg/SVGAnimationElement.idl\nWebCore/svg/SVGCircleElement.idl\nWebCore/svg/SVGClipPathElement.idl\nWebCore/svg/SVGColor.idl\nWebCore/svg/SVGComponentTransferFunctionElement.idl\nWebCore/svg/SVGCursorElement.idl\nWebCore/svg/SVGDefsElement.idl\nWebCore/svg/SVGDescElement.idl\nWebCore/svg/SVGDocument.idl\nWebCore/svg/SVGElement.idl\nWebCore/svg/SVGElementInstance.idl\nWebCore/svg/SVGElementInstanceList.idl\nWebCore/svg/SVGEllipseElement.idl\nWebCore/svg/SVGException.idl\nWebCore/svg/SVGExternalResourcesRequired.idl\nWebCore/svg/SVGFEBlendElement.idl\nWebCore/svg/SVGFEColorMatrixElement.idl\nWebCore/svg/SVGFEComponentTransferElement.idl\nWebCore/svg/SVGFECompositeElement.idl\nWebCore/svg/SVGFEConvolveMatrixElement.idl\nWebCore/svg/SVGFEDiffuseLightingElement.idl\nWebCore/svg/SVGFEDisplacementMapElement.idl\nWebCore/svg/SVGFEDistantLightElement.idl\nWebCore/svg/SVGFEDropShadowElement.idl\nWebCore/svg/SVGFEFloodElement.idl\nWebCore/svg/SVGFEFuncAElement.idl\nWebCore/svg/SVGFEFuncBElement.idl\nWebCore/svg/SVGFEFuncGElement.idl\nWebCore/svg/SVGFEFuncRElement.idl\nWebCore/svg/SVGFEGaussianBlurElement.idl\nWebCore/svg/SVGFEImageElement.idl\nWebCore/svg/SVGFEMergeElement.idl\nWebCore/svg/SVGFEMergeNodeElement.idl\nWebCore/svg/SVGFEMorphologyElement.idl\nWebCore/svg/SVGFEOffsetElement.idl\nWebCore/svg/SVGFEPointLightElement.idl\nWebCore/svg/SVGFESpecularLightingElement.idl\nWebCore/svg/SVGFESpotLightElement.idl\nWebCore/svg/SVGFETileElement.idl\nWebCore/svg/SVGFETurbulenceElement.idl\nWebCore/svg/SVGFilterElement.idl\nWebCore/svg/SVGFilterPrimitiveStandardAttributes.idl\nWebCore/svg/SVGFitToViewBox.idl\nWebCore/svg/SVGFontElement.idl\nWebCore/svg/SVGFontFaceElement.idl\nWebCore/svg/SVGFontFaceFormatElement.idl\nWebCore/svg/SVGFontFaceNameElement.idl\nWebCore/svg/SVGFontFaceSrcElement.idl\nWebCore/svg/SVGFontFaceUriElement.idl\nWebCore/svg/SVGForeignObjectElement.idl\nWebCore/svg/SVGGElement.idl\nWebCore/svg/SVGGlyphElement.idl\nWebCore/svg/SVGGlyphRefElement.idl\nWebCore/svg/SVGGradientElement.idl\nWebCore/svg/SVGHKernElement.idl\nWebCore/svg/SVGImageElement.idl\nWebCore/svg/SVGLangSpace.idl\nWebCore/svg/SVGLength.idl\nWebCore/svg/SVGLengthList.idl\nWebCore/svg/SVGLineElement.idl\nWebCore/svg/SVGLinearGradientElement.idl\nWebCore/svg/SVGLocatable.idl\nWebCore/svg/SVGMPathElement.idl\nWebCore/svg/SVGMarkerElement.idl\nWebCore/svg/SVGMaskElement.idl\nWebCore/svg/SVGMatrix.idl\nWebCore/svg/SVGMetadataElement.idl\nWebCore/svg/SVGMissingGlyphElement.idl\nWebCore/svg/SVGNumber.idl\nWebCore/svg/SVGNumberList.idl\nWebCore/svg/SVGPaint.idl\nWebCore/svg/SVGPathElement.idl\nWebCore/svg/SVGPathSeg.idl\nWebCore/svg/SVGPathSegArcAbs.idl\nWebCore/svg/SVGPathSegArcRel.idl\nWebCore/svg/SVGPathSegClosePath.idl\nWebCore/svg/SVGPathSegCurvetoCubicAbs.idl\nWebCore/svg/SVGPathSegCurvetoCubicRel.idl\nWebCore/svg/SVGPathSegCurvetoCubicSmoothAbs.idl\nWebCore/svg/SVGPathSegCurvetoCubicSmoothRel.idl\nWebCore/svg/SVGPathSegCurvetoQuadraticAbs.idl\nWebCore/svg/SVGPathSegCurvetoQuadraticRel.idl\nWebCore/svg/SVGPathSegCurvetoQuadraticSmoothAbs.idl\nWebCore/svg/SVGPathSegCurvetoQuadraticSmoothRel.idl\nWebCore/svg/SVGPathSegLinetoAbs.idl\nWebCore/svg/SVGPathSegLinetoHorizontalAbs.idl\nWebCore/svg/SVGPathSegLinetoHorizontalRel.idl\nWebCore/svg/SVGPathSegLinetoRel.idl\nWebCore/svg/SVGPathSegLinetoVerticalAbs.idl\nWebCore/svg/SVGPathSegLinetoVerticalRel.idl\nWebCore/svg/SVGPathSegList.idl\nWebCore/svg/SVGPathSegMovetoAbs.idl\nWebCore/svg/SVGPathSegMovetoRel.idl\nWebCore/svg/SVGPatternElement.idl\nWebCore/svg/SVGPoint.idl\nWebCore/svg/SVGPointList.idl\nWebCore/svg/SVGPolygonElement.idl\nWebCore/svg/SVGPolylineElement.idl\nWebCore/svg/SVGPreserveAspectRatio.idl\nWebCore/svg/SVGRadialGradientElement.idl\nWebCore/svg/SVGRect.idl\nWebCore/svg/SVGRectElement.idl\nWebCore/svg/SVGRenderingIntent.idl\nWebCore/svg/SVGSVGElement.idl\nWebCore/svg/SVGScriptElement.idl\nWebCore/svg/SVGSetElement.idl\nWebCore/svg/SVGStopElement.idl\nWebCore/svg/SVGStringList.idl\nWebCore/svg/SVGStyleElement.idl\nWebCore/svg/SVGStyledElement.idl\nWebCore/svg/SVGSwitchElement.idl\nWebCore/svg/SVGSymbolElement.idl\nWebCore/svg/SVGTRefElement.idl\nWebCore/svg/SVGTSpanElement.idl\nWebCore/svg/SVGTests.idl\nWebCore/svg/SVGTextContentElement.idl\nWebCore/svg/SVGTextElement.idl\nWebCore/svg/SVGTextPathElement.idl\nWebCore/svg/SVGTextPositioningElement.idl\nWebCore/svg/SVGTitleElement.idl\nWebCore/svg/SVGTransform.idl\nWebCore/svg/SVGTransformList.idl\nWebCore/svg/SVGTransformable.idl\nWebCore/svg/SVGURIReference.idl\nWebCore/svg/SVGUnitTypes.idl\nWebCore/svg/SVGUseElement.idl\nWebCore/svg/SVGVKernElement.idl\nWebCore/svg/SVGViewElement.idl\nWebCore/svg/SVGViewSpec.idl\nWebCore/svg/SVGZoomAndPan.idl\nWebCore/svg/SVGZoomEvent.idl\nWebCore/testing/Internals.idl\nWebCore/testing/InternalSettings.idl\nWebCore/testing/MallocStatistics.idl\nWebCore/testing/MemoryInfo.idl\nWebCore/testing/TypeConversions.idl\nWebCore/workers/AbstractWorker.idl\nWebCore/workers/DedicatedWorkerContext.idl\nWebCore/workers/SharedWorker.idl\nWebCore/workers/SharedWorkerContext.idl\nWebCore/workers/Worker.idl\nWebCore/workers/WorkerContext.idl\nWebCore/workers/WorkerLocation.idl\nWebCore/xml/DOMParser.idl\nWebCore/xml/XMLHttpRequest.idl\nWebCore/xml/XMLHttpRequestException.idl\nWebCore/xml/XMLHttpRequestProgressEvent.idl\nWebCore/xml/XMLHttpRequestUpload.idl\nWebCore/xml/XMLSerializer.idl\nWebCore/xml/XPathEvaluator.idl\nWebCore/xml/XPathException.idl\nWebCore/xml/XPathExpression.idl\nWebCore/xml/XPathNSResolver.idl\nWebCore/xml/XPathResult.idl\nWebCore/xml/XSLTProcessor.idl\nInternalSettingsGenerated.idl\nWebCore/inspector/JavaScriptCallFrame.idl\n" > ./idl_files.tmp perl JavaScriptCore/docs/make-bytecode-docs.pl JavaScriptCore/interpreter/Interpreter.cpp docs/bytecode.html cat WebCore/css/CSSPropertyNames.in WebCore/css/SVGCSSPropertyNames.in > CSSPropertyNames.in rm -f ./idl_files.tmp -- GitLab