Attachment #186473 for bug #108862

View Details Raw Unified Return to Bug 108862

| Differences between



2013-02-04  Julien Brianceau  <jbrianceau@nds.com>

        Build is broken since r141543 for platforms without OpenGL
        https://bugs.webkit.org/show_bug.cgi?id=108862

        Reviewed by NOBODY (OOPS!).

        * Target.pri:

2013-02-04  Mark Pilgrim  <pilgrim@chromium.org>

        [Chromium] Move WorkerContextProxy to WebCore



    platform/graphics/surfaces/GraphicsSurface.h \
    platform/graphics/surfaces/GraphicsSurfaceToken.h \
    platform/graphics/SurrogatePairAwareTextIterator.h \
    platform/graphics/texmap/coordinated/AreaAllocator.h \
    platform/graphics/texmap/coordinated/CoordinatedBackingStore.h \
    platform/graphics/texmap/coordinated/CoordinatedCustomFilterOperation.h \
    platform/graphics/texmap/coordinated/CoordinatedCustomFilterProgram.h \
    platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h \
    platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.h \
    platform/graphics/texmap/coordinated/CoordinatedImageBacking.h \
    platform/graphics/texmap/coordinated/CoordinatedLayerInfo.h \
    platform/graphics/texmap/coordinated/CoordinatedSurface.h \
    platform/graphics/texmap/coordinated/CoordinatedTile.h \
    platform/graphics/texmap/coordinated/SurfaceUpdateInfo.h \
    platform/graphics/texmap/coordinated/UpdateAtlas.h \
    platform/graphics/texmap/GraphicsLayerTextureMapper.h \
    platform/graphics/texmap/TextureMapper.h \
    platform/graphics/texmap/TextureMapperBackingStore.h \

    platform/graphics/qt/PathQt.cpp \
    platform/graphics/qt/PatternQt.cpp \
    platform/graphics/qt/StillImageQt.cpp \
    platform/graphics/texmap/coordinated/AreaAllocator.cpp \
    platform/graphics/texmap/coordinated/CoordinatedBackingStore.cpp \
    platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp \
    platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp \
    platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp \
    platform/graphics/texmap/coordinated/CoordinatedSurface.cpp \
    platform/graphics/texmap/coordinated/CoordinatedTile.cpp \
    platform/graphics/texmap/coordinated/UpdateAtlas.cpp \
    platform/graphics/texmap/GraphicsLayerTextureMapper.cpp \
    platform/graphics/texmap/TextureMapper.cpp \
    platform/graphics/texmap/TextureMapperBackingStore.cpp \

        platform/graphics/gpu/TilingData.h \
        platform/graphics/opengl/Extensions3DOpenGL.h \
        platform/graphics/texmap/TextureMapperGL.h \
        platform/graphics/texmap/TextureMapperShaderProgram.h \
        platform/graphics/texmap/coordinated/AreaAllocator.h \
        platform/graphics/texmap/coordinated/CoordinatedBackingStore.h \
        platform/graphics/texmap/coordinated/CoordinatedCustomFilterOperation.h \
        platform/graphics/texmap/coordinated/CoordinatedCustomFilterProgram.h \
        platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h \
        platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.h \
        platform/graphics/texmap/coordinated/CoordinatedImageBacking.h \
        platform/graphics/texmap/coordinated/CoordinatedLayerInfo.h \
        platform/graphics/texmap/coordinated/CoordinatedSurface.h \
        platform/graphics/texmap/coordinated/CoordinatedTile.h \
        platform/graphics/texmap/coordinated/SurfaceUpdateInfo.h \
        platform/graphics/texmap/coordinated/UpdateAtlas.h

    SOURCES += \
        platform/graphics/ANGLEWebKitBridge.cpp \

        platform/graphics/opengl/Extensions3DOpenGLCommon.cpp \
        platform/graphics/qt/GraphicsContext3DQt.cpp \
        platform/graphics/texmap/TextureMapperGL.cpp \
        platform/graphics/texmap/TextureMapperShaderProgram.cpp \
        platform/graphics/texmap/coordinated/AreaAllocator.cpp \
        platform/graphics/texmap/coordinated/CoordinatedBackingStore.cpp \
        platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp \
        platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp \
        platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp \
        platform/graphics/texmap/coordinated/CoordinatedSurface.cpp \
        platform/graphics/texmap/coordinated/CoordinatedTile.cpp \
        platform/graphics/texmap/coordinated/UpdateAtlas.cpp

    INCLUDEPATH += $$PWD/platform/graphics/gpu


Return to Bug 108862

Lines 2243-2260 HEADERS += \ Source/WebCore/Target.pri_sec1
- Source/WebCore/Target.pri -22 / +22 lines
2243	platform/graphics/surfaces/GraphicsSurface.h \	2243	platform/graphics/surfaces/GraphicsSurface.h \
2244	platform/graphics/surfaces/GraphicsSurfaceToken.h \	2244	platform/graphics/surfaces/GraphicsSurfaceToken.h \
2245	platform/graphics/SurrogatePairAwareTextIterator.h \	2245	platform/graphics/SurrogatePairAwareTextIterator.h \
2246	platform/graphics/texmap/coordinated/AreaAllocator.h \
2247	platform/graphics/texmap/coordinated/CoordinatedBackingStore.h \
2248	platform/graphics/texmap/coordinated/CoordinatedCustomFilterOperation.h \
2249	platform/graphics/texmap/coordinated/CoordinatedCustomFilterProgram.h \
2250	platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h \
2251	platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.h \
2252	platform/graphics/texmap/coordinated/CoordinatedImageBacking.h \
2253	platform/graphics/texmap/coordinated/CoordinatedLayerInfo.h \
2254	platform/graphics/texmap/coordinated/CoordinatedSurface.h \
2255	platform/graphics/texmap/coordinated/CoordinatedTile.h \
2256	platform/graphics/texmap/coordinated/SurfaceUpdateInfo.h \
2257	platform/graphics/texmap/coordinated/UpdateAtlas.h \
2258	platform/graphics/texmap/GraphicsLayerTextureMapper.h \	2246	platform/graphics/texmap/GraphicsLayerTextureMapper.h \
2259	platform/graphics/texmap/TextureMapper.h \	2247	platform/graphics/texmap/TextureMapper.h \
2260	platform/graphics/texmap/TextureMapperBackingStore.h \	2248	platform/graphics/texmap/TextureMapperBackingStore.h \
Lines 2890-2903 SOURCES += \ Source/WebCore/Target.pri_sec2
2890	platform/graphics/qt/PathQt.cpp \	2878	platform/graphics/qt/PathQt.cpp \
2891	platform/graphics/qt/PatternQt.cpp \	2879	platform/graphics/qt/PatternQt.cpp \
2892	platform/graphics/qt/StillImageQt.cpp \	2880	platform/graphics/qt/StillImageQt.cpp \
2893	platform/graphics/texmap/coordinated/AreaAllocator.cpp \
2894	platform/graphics/texmap/coordinated/CoordinatedBackingStore.cpp \
2895	platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp \
2896	platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp \
2897	platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp \
2898	platform/graphics/texmap/coordinated/CoordinatedSurface.cpp \
2899	platform/graphics/texmap/coordinated/CoordinatedTile.cpp \
2900	platform/graphics/texmap/coordinated/UpdateAtlas.cpp \
2901	platform/graphics/texmap/GraphicsLayerTextureMapper.cpp \	2881	platform/graphics/texmap/GraphicsLayerTextureMapper.cpp \
2902	platform/graphics/texmap/TextureMapper.cpp \	2882	platform/graphics/texmap/TextureMapper.cpp \
2903	platform/graphics/texmap/TextureMapperBackingStore.cpp \	2883	platform/graphics/texmap/TextureMapperBackingStore.cpp \
Lines 4070-4076 use?(3D_GRAPHICS) { Source/WebCore/Target.pri_sec3
4070	platform/graphics/gpu/TilingData.h \	4050	platform/graphics/gpu/TilingData.h \
4071	platform/graphics/opengl/Extensions3DOpenGL.h \	4051	platform/graphics/opengl/Extensions3DOpenGL.h \
4072	platform/graphics/texmap/TextureMapperGL.h \	4052	platform/graphics/texmap/TextureMapperGL.h \
4073	platform/graphics/texmap/TextureMapperShaderProgram.h	4053	platform/graphics/texmap/TextureMapperShaderProgram.h \
		4054	platform/graphics/texmap/coordinated/AreaAllocator.h \
		4055	platform/graphics/texmap/coordinated/CoordinatedBackingStore.h \
		4056	platform/graphics/texmap/coordinated/CoordinatedCustomFilterOperation.h \
		4057	platform/graphics/texmap/coordinated/CoordinatedCustomFilterProgram.h \
		4058	platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h \
		4059	platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.h \
		4060	platform/graphics/texmap/coordinated/CoordinatedImageBacking.h \
		4061	platform/graphics/texmap/coordinated/CoordinatedLayerInfo.h \
		4062	platform/graphics/texmap/coordinated/CoordinatedSurface.h \
		4063	platform/graphics/texmap/coordinated/CoordinatedTile.h \
		4064	platform/graphics/texmap/coordinated/SurfaceUpdateInfo.h \
		4065	platform/graphics/texmap/coordinated/UpdateAtlas.h
4074		4066
4075	SOURCES += \	4067	SOURCES += \
4076	platform/graphics/ANGLEWebKitBridge.cpp \	4068	platform/graphics/ANGLEWebKitBridge.cpp \
Lines 4083-4089 use?(3D_GRAPHICS) { Source/WebCore/Target.pri_sec4
4083	platform/graphics/opengl/Extensions3DOpenGLCommon.cpp \	4075	platform/graphics/opengl/Extensions3DOpenGLCommon.cpp \
4084	platform/graphics/qt/GraphicsContext3DQt.cpp \	4076	platform/graphics/qt/GraphicsContext3DQt.cpp \
4085	platform/graphics/texmap/TextureMapperGL.cpp \	4077	platform/graphics/texmap/TextureMapperGL.cpp \
4086	platform/graphics/texmap/TextureMapperShaderProgram.cpp	4078	platform/graphics/texmap/TextureMapperShaderProgram.cpp \
		4079	platform/graphics/texmap/coordinated/AreaAllocator.cpp \
		4080	platform/graphics/texmap/coordinated/CoordinatedBackingStore.cpp \
		4081	platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp \
		4082	platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp \
		4083	platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp \
		4084	platform/graphics/texmap/coordinated/CoordinatedSurface.cpp \
		4085	platform/graphics/texmap/coordinated/CoordinatedTile.cpp \
		4086	platform/graphics/texmap/coordinated/UpdateAtlas.cpp
4087		4087
4088	INCLUDEPATH += $$PWD/platform/graphics/gpu	4088	INCLUDEPATH += $$PWD/platform/graphics/gpu
4089		4089

Lines 1-3 Source/WebCore/ChangeLog_sec1
- Source/WebCore/ChangeLog +9 lines
		1	2013-02-04 Julien Brianceau <jbrianceau@nds.com>
		2
		3	Build is broken since r141543 for platforms without OpenGL
		4	https://bugs.webkit.org/show_bug.cgi?id=108862
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* Target.pri:
		9
1	2013-02-04 Mark Pilgrim <pilgrim@chromium.org>	10	2013-02-04 Mark Pilgrim <pilgrim@chromium.org>
2		11
3	[Chromium] Move WorkerContextProxy to WebCore	12	[Chromium] Move WorkerContextProxy to WebCore