Diff
Modified: trunk/Source/WebCore/ChangeLog (134248 => 134249)
--- trunk/Source/WebCore/ChangeLog 2012-11-12 17:42:19 UTC (rev 134248)
+++ trunk/Source/WebCore/ChangeLog 2012-11-12 17:50:23 UTC (rev 134249)
@@ -1,5 +1,19 @@
2012-11-12 Kentaro Hara <[email protected]>
+ [V8] Performance::memory getter needs not to be [Custom]
+ https://bugs.webkit.org/show_bug.cgi?id=101890
+
+ Reviewed by Adam Barth.
+
+ No tests. No change in behavior.
+
+ * UseV8.cmake:
+ * WebCore.gypi:
+ * bindings/v8/custom/V8PerformanceCustom.cpp: Removed.
+ * page/Performance.idl:
+
+2012-11-12 Kentaro Hara <[email protected]>
+
[V8][JSC] HTMLOptionsCollection::length needs not to be [Custom]
https://bugs.webkit.org/show_bug.cgi?id=101888
Modified: trunk/Source/WebCore/UseV8.cmake (134248 => 134249)
--- trunk/Source/WebCore/UseV8.cmake 2012-11-12 17:42:19 UTC (rev 134248)
+++ trunk/Source/WebCore/UseV8.cmake 2012-11-12 17:50:23 UTC (rev 134249)
@@ -137,7 +137,6 @@
bindings/v8/custom/V8NodeListCustom.cpp
bindings/v8/custom/V8NotificationCustom.cpp
bindings/v8/custom/V8NotificationCenterCustom.cpp
- bindings/v8/custom/V8PerformanceCustom.cpp
bindings/v8/custom/V8PerformanceEntryCustom.cpp
bindings/v8/custom/V8PopStateEventCustom.cpp
bindings/v8/custom/V8SQLResultSetRowListCustom.cpp
Modified: trunk/Source/WebCore/WebCore.gypi (134248 => 134249)
--- trunk/Source/WebCore/WebCore.gypi 2012-11-12 17:42:19 UTC (rev 134248)
+++ trunk/Source/WebCore/WebCore.gypi 2012-11-12 17:50:23 UTC (rev 134249)
@@ -2402,7 +2402,6 @@
'bindings/v8/custom/V8NodeListCustom.cpp',
'bindings/v8/custom/V8NotificationCustom.cpp',
'bindings/v8/custom/V8NotificationCenterCustom.cpp',
- 'bindings/v8/custom/V8PerformanceCustom.cpp',
'bindings/v8/custom/V8PerformanceEntryCustom.cpp',
'bindings/v8/custom/V8PopStateEventCustom.cpp',
'bindings/v8/custom/V8SQLResultSetRowListCustom.cpp',
Deleted: trunk/Source/WebCore/bindings/v8/custom/V8PerformanceCustom.cpp (134248 => 134249)
--- trunk/Source/WebCore/bindings/v8/custom/V8PerformanceCustom.cpp 2012-11-12 17:42:19 UTC (rev 134248)
+++ trunk/Source/WebCore/bindings/v8/custom/V8PerformanceCustom.cpp 2012-11-12 17:50:23 UTC (rev 134249)
@@ -1,53 +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 "V8Performance.h"
-
-#if ENABLE(WEB_TIMING)
-
-#include "Performance.h"
-#include "V8Binding.h"
-#include "V8MemoryInfo.h"
-
-namespace WebCore {
-
-// FIXME: Why does this need to be custom?
-v8::Handle<v8::Value> V8Performance::memoryAccessorGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
-{
- INC_STATS("DOM.Performance.memoryAccessorGetter");
- Performance* imp = V8Performance::toNative(info.Holder());
- return toV8(imp->memory(), info.Holder(), info.GetIsolate());
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(WEB_TIMING)
Modified: trunk/Source/WebCore/page/Performance.idl (134248 => 134249)
--- trunk/Source/WebCore/page/Performance.idl 2012-11-12 17:42:19 UTC (rev 134248)
+++ trunk/Source/WebCore/page/Performance.idl 2012-11-12 17:50:23 UTC (rev 134249)
@@ -37,7 +37,7 @@
] interface Performance {
readonly attribute PerformanceNavigation navigation;
readonly attribute PerformanceTiming timing;
- [V8CustomGetter] readonly attribute MemoryInfo memory;
+ readonly attribute MemoryInfo memory;
#if defined(ENABLE_PERFORMANCE_TIMELINE) && ENABLE_PERFORMANCE_TIMELINE
PerformanceEntryList webkitGetEntries();