Modified: branches/safari-534.51-branch/Source/WebCore/ChangeLog (94096 => 94097)
--- branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-08-30 19:26:04 UTC (rev 94096)
+++ branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-08-30 20:01:17 UTC (rev 94097)
@@ -1,3 +1,7 @@
+2011-08-30 Lucas Forschler <[email protected]>
+
+ Reverted 93664.
+
2011-08-29 Lucas Forschler <[email protected]>
Merged 93793
Modified: branches/safari-534.51-branch/Source/WebCore/bindings/js/JSImageDataCustom.cpp (94096 => 94097)
--- branches/safari-534.51-branch/Source/WebCore/bindings/js/JSImageDataCustom.cpp 2011-08-30 19:26:04 UTC (rev 94096)
+++ branches/safari-534.51-branch/Source/WebCore/bindings/js/JSImageDataCustom.cpp 2011-08-30 20:01:17 UTC (rev 94097)
@@ -48,10 +48,8 @@
wrapper = CREATE_DOM_WRAPPER(exec, globalObject, ImageData, imageData);
Identifier dataName(exec, "data");
static const ClassInfo cpaClassInfo = { "CanvasPixelArray", &JSByteArray::Base::s_info, 0, 0 };
- Structure* cpaStructure = getCachedDOMStructure(globalObject, &cpaClassInfo);
- if (!cpaStructure)
- cpaStructure = cacheDOMStructure(globalObject, JSByteArray::createStructure(exec->globalData(), jsNull(), &cpaClassInfo), &cpaClassInfo);
- wrapper->putDirect(exec->globalData(), dataName, JSByteArray::create(exec, cpaStructure, imageData->data()->data()), DontDelete | ReadOnly);
+ DEFINE_STATIC_LOCAL(Strong<Structure>, cpaStructure, (exec->globalData(), JSByteArray::createStructure(exec->globalData(), jsNull(), &cpaClassInfo)));
+ wrapper->putDirect(exec->globalData(), dataName, JSByteArray::create(exec, cpaStructure.get(), imageData->data()->data()), DontDelete | ReadOnly);
exec->heap()->reportExtraMemoryCost(imageData->data()->length());
return wrapper;
