Bug 23458 – Reintroduce CanvasPixelArray in ImageData.idl

• Status: RESOLVED
• Resolution: FIXED
• Component: DOM

[Ivan Posva]

Reintroduce CanvasPixelArray in ImageData.idl:

Recent changes to the ImageData.idl broke non-JSC bindings. This change reintroduces the CanvasPixelArray and for the JSC build defines it to be equivalent to WTF::ByteArray.

[Ivan Posva]

Created attachment 26897 [details]
proposed patch

Ideally I would have wanted to use "#if defined(LANGUAGE_JAVASCRIPT) && !defined(JSC_BINDING)" as you suggested to Darin, but it appears that something like JSC_BINDING does not exist in the code generator.

[Oliver Hunt]

Comment on attachment 26897 [details]
proposed patch

r=me

[Oliver Hunt]

Comment on attachment 26897 [details]
proposed patch

Actually, on second thoughts, i think a better solution would be to make CanvasPixelArray be a subclass of ByteArray for those builds that need it -- all builds should be using WTF::ByteArray to ensure consistency, and just typedef-ing the type difference away could lead to platform inconsistencies

[Oliver Hunt]

Basically, my though is that ImageData should be in terms of WTF::ByteArray, but those builds that need to declare it as type CanvasPixelArray should have there own typedef

[Oliver Hunt]

Err, need to declare in IDL -- do we support typedefs in IDL files?

[Oliver Hunt]

Created attachment 26899 [details]
Return CPA to basically its old implementation, extra indirection and all

This builds, just doing final layout test run atm

[Alexey Proskuryakov]

Comment on attachment 26899 [details]
Return CPA to basically its old implementation, extra indirection and all

r=me

+#if !defined(LANGUAGE_JAVASCRIPT) || !defined(JSC_BINDING)
...
+#if !defined(LANGUAGE_JAVASCRIPT) || defined(V8_BINDING)

Is it intentional that the checks are different?

[Oliver Hunt]

Committed r40089
	M	WebCore/WebCore.pro
	M	WebCore/ChangeLog
	M	WebCore/WebCore.vcproj/WebCore.vcproj
	M	WebCore/GNUmakefile.am
	M	WebCore/platform/graphics/cg/ImageBufferCG.cpp
	M	WebCore/platform/graphics/cairo/ImageBufferCairo.cpp
	M	WebCore/bindings/js/JSImageDataCustom.cpp
	M	WebCore/html/ImageData.h
	A	WebCore/html/CanvasPixelArray.h
	M	WebCore/html/ImageData.idl
	M	WebCore/html/ImageData.cpp
	A	WebCore/html/CanvasPixelArray.idl
	A	WebCore/html/CanvasPixelArray.cpp
	M	WebCore/html/CanvasRenderingContext2D.cpp
	M	WebCore/WebCore.xcodeproj/project.pbxproj
	M	WebCore/WebCoreSources.bkl