Title: [91113] trunk/Source/WebCore
- Revision
- 91113
- Author
- [email protected]
- Date
- 2011-07-15 14:24:32 -0700 (Fri, 15 Jul 2011)
Log Message
Unreviewed, rolling out r90592.
http://trac.webkit.org/changeset/90592
https://bugs.webkit.org/show_bug.cgi?id=64627
Causes crashes with the web audio async decoding API
(Requested by jamesr on #webkit).
Patch by Sheriff Bot <[email protected]> on 2011-07-15
* html/canvas/ArrayBuffer.cpp:
(WebCore::ArrayBuffer::~ArrayBuffer):
(WebCore::ArrayBuffer::tryAllocate):
* manual-tests/array-buffer-memory.html: Removed.
Modified Paths
Removed Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (91112 => 91113)
--- trunk/Source/WebCore/ChangeLog 2011-07-15 21:22:45 UTC (rev 91112)
+++ trunk/Source/WebCore/ChangeLog 2011-07-15 21:24:32 UTC (rev 91113)
@@ -1,3 +1,17 @@
+2011-07-15 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r90592.
+ http://trac.webkit.org/changeset/90592
+ https://bugs.webkit.org/show_bug.cgi?id=64627
+
+ Causes crashes with the web audio async decoding API
+ (Requested by jamesr on #webkit).
+
+ * html/canvas/ArrayBuffer.cpp:
+ (WebCore::ArrayBuffer::~ArrayBuffer):
+ (WebCore::ArrayBuffer::tryAllocate):
+ * manual-tests/array-buffer-memory.html: Removed.
+
2011-07-15 Kenneth Russell <[email protected]>
Don't restore WebGL context if it was guilty of a graphics reset
Modified: trunk/Source/WebCore/html/canvas/ArrayBuffer.cpp (91112 => 91113)
--- trunk/Source/WebCore/html/canvas/ArrayBuffer.cpp 2011-07-15 21:22:45 UTC (rev 91112)
+++ trunk/Source/WebCore/html/canvas/ArrayBuffer.cpp 2011-07-15 21:24:32 UTC (rev 91113)
@@ -26,10 +26,6 @@
#include "config.h"
#include "ArrayBuffer.h"
-#if USE(V8)
-#include "V8Binding.h"
-#endif
-
#include <wtf/RefPtr.h>
namespace WebCore {
@@ -80,9 +76,6 @@
ArrayBuffer::~ArrayBuffer()
{
-#if USE(V8)
- v8::V8::AdjustAmountOfExternalAllocatedMemory(-m_sizeInBytes);
-#endif
WTF::fastFree(m_data);
}
@@ -98,12 +91,8 @@
if (totalSize / numElements != elementByteSize)
return 0;
}
- if (WTF::tryFastCalloc(numElements, elementByteSize).getValue(result)) {
-#if USE(V8)
- v8::V8::AdjustAmountOfExternalAllocatedMemory(numElements * elementByteSize);
-#endif
+ if (WTF::tryFastCalloc(numElements, elementByteSize).getValue(result))
return result;
- }
return 0;
}
Deleted: trunk/Source/WebCore/manual-tests/array-buffer-memory.html (91112 => 91113)
--- trunk/Source/WebCore/manual-tests/array-buffer-memory.html 2011-07-15 21:22:45 UTC (rev 91112)
+++ trunk/Source/WebCore/manual-tests/array-buffer-memory.html 2011-07-15 21:24:32 UTC (rev 91113)
@@ -1,18 +0,0 @@
-<html>
-<head>
-<title>ArrayBuffer memory test</title>
-</head>
-<body>
-Test creating many ArrayBuffers. The page should fully load without crashing and without using more than ~300mb of ram.
-<script>
-
-function allocateLargeBuffer() {
- var arrayBuffer = new ArrayBuffer(64*1024*1024);
-}
-
-for (var i=0; i<96; ++i)
- allocateLargeBuffer();
-</script>
-
-</body>
-</html>
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
