| Summary: | Fix the !ENABLE(FILTERS) build | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | WebKit | Reporter: | Laszlo Vidacs <lvidacs.u-szeged> | ||||||||
| Component: | WebCore Misc. | Assignee: | Laszlo Vidacs <lvidacs.u-szeged> | ||||||||
| Status: | RESOLVED FIXED | ||||||||||
| Severity: | Normal | CC: | commit-queue, d-r, esprehn+autocc, fmalita, glenn, gyuyoung.kim, gyuyoung.kim, kondapallykalyan, ossy, pdr, schenney, sergio | ||||||||
| Priority: | P2 | ||||||||||
| Version: | 528+ (Nightly build) | ||||||||||
| Hardware: | Unspecified | ||||||||||
| OS: | Unspecified | ||||||||||
| Attachments: |
|
||||||||||
|
Description
Laszlo Vidacs
2014-03-18 06:02:46 PDT
Created attachment 227045 [details]
Patch
Comment on attachment 227045 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=227045&action=review > Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp:53 > +#include <runtime/JSCInlines.h> I think it would be good to move these includes to 42 line for alphabetic order. Could you explain what kind of link failure did you get and how is it related to ENABLE(FILTERS) ? Created attachment 227180 [details]
Patch
After adding the necessary includes to RenderSVGImage.cpp and RenderSVGRoot.cpp I got the following linker error: Linking CXX shared library ../../lib/libwebcore_efl.so CMakeFiles/WebCore.dir/platform/graphics/cairo/ImageBufferCairo.cpp.o: In function `WTF::PassRefPtr<JSC::GenericTypedArrayView<JSC::Uint8ClampedAdaptor> > WebCore::getImageData<(WebCore::Multiply)1>(WebCore::IntRect const&, WebCore::ImageBufferData const&, WebCore::IntSize const&)': ImageBufferCairo.cpp:(.text._ZN7WebCore12getImageDataILNS_8MultiplyE1EEEN3WTF10PassRefPtrIN3JSC21GenericTypedArrayViewINS4_19Uint8ClampedAdaptorEEEEERKNS_7IntRectERKNS_15ImageBufferDataERKNS_7IntSizeE[_ZN7WebCore12getImageDataILNS_8MultiplyE1EEEN3WTF10PassRefPtrIN3JSC21GenericTypedArrayViewINS4_19Uint8ClampedAdaptorEEEEERKNS_7IntRectERKNS_15ImageBufferDataERKNS_7IntSizeE]+0x41): undefined reference to `JSC::GenericTypedArrayView<JSC::Uint8ClampedAdaptor>::createUninitialized(unsigned int)' ... The missing GenericTypedArrayView<>::createUninitialized is from JSC and is included through runtime/TypedArrayInlines.h from WebCore (as in WebCore/platform/graphics/filters/FilterEffect.cpp but it is guarded by ENABLE(FILTERS) ). The added includes are lifted up from cairo/ImageBufferCairo.cpp to ImageBuffer.h, so ImageBuffer.cpp can also use them. Could you check the build error on efl-wk2 ews bubble ? Last 500 characters of output: ore.dir/__/__/DerivedSources/WebCore/JSSVGFEMergeElement.cpp.o c++: internal compiler error: Killed (program cc1plus) Please submit a full bug report, with preprocessed source if appropriate. See <file:///usr/share/doc/gcc-4.7/README.Bugs> for instructions. make[2]: *** [Source/WebCore/CMakeFiles/WebCore.dir/__/__/DerivedSources/WebCore/JSDOMWindow.cpp.o] Error 4 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [Source/WebCore/CMakeFiles/WebCore.dir/all] Error 2 make: *** [all] Error 2 Failed to run "['Tools/Scripts/build-webkit', '--release', '--efl', '--update-efl', '--no-webkit1', '--makeargs="-j8"']" exit_code: 2 tingElement.cpp.o [ 22%] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/__/__/DerivedSources/WebCore/JSSVGFEDisplacementMapElement.cpp.o [ 22%] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/__/__/DerivedSources/WebCore/JSSVGFEDropShadowElement.cpp.o [ 22%] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/__/__/DerivedSources/WebCore/JSSVGFEFloodElement.cpp.o [ 22%] [ 22%] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/__/__/DerivedSources/WebCore/JSSVGFEFuncAElement.cpp.o Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/__/__/DerivedSources/WebCore/JSSVGFEFuncBElement.cpp.o [ 22%] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/__/__/DerivedSources/WebCore/JSSVGFEFuncGElement.cpp.o [ 22%] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/__/__/DerivedSources/WebCore/JSSVGFEFuncRElement.cpp.o [ 22%] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/__/__/DerivedSources/WebCore/JSSVGFEGaussianBlurElement.cpp.o [ 22%] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/__/__/DerivedSources/WebCore/JSSVGFEImageElement.cpp.o [ 22%] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/__/__/DerivedSources/WebCore/JSSVGFEMergeElement.cpp.o c++: internal compiler error: Killed (program cc1plus) Please submit a full bug report, with preprocessed source if appropriate. See <file:///usr/share/doc/gcc-4.7/README.Bugs> for instructions. make[2]: *** [Source/WebCore/CMakeFiles/WebCore.dir/__/__/DerivedSources/WebCore/JSDOMWindow.cpp.o] Error 4 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [Source/WebCore/CMakeFiles/WebCore.dir/all] Error 2 make: *** [all] Error 2 Created attachment 227279 [details]
Patch
Resubmitted the patch, it seems that the EWS bot failed before. Comment on attachment 227279 [details]
Patch
LGTM. Ossy, any issue before landing ?
Comment on attachment 227279 [details] Patch Clearing flags on attachment: 227279 Committed r166056: <http://trac.webkit.org/changeset/166056> All reviewed patches have been landed. Closing bug. |