← Back to branch summary

~ubuntu-branches/ubuntu/lucid/webkit/lucid-security

« back to all changes in this revision

Viewing changes to WebCore/GNUmakefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Gustavo Noronha Silva
  • Date: 2010-01-20 20:09:57 UTC
  • mfrom: (1.2.7 upstream) (4.3.8 sid)
  • Revision ID: james.westby@ubuntu.com-20100120200957-3ng8lah18c7pmm52
http://bugs.debian.org/565166
* New upstream release
- Fixes crashes related to clearing the clipboard, which many users were
  experiencing (Closes: #565166)

Show diffs side-by-side

added added

removed removed

Lines of Context:
WebCore/GNUmakefile.am
14
14
        -I$(srcdir)/WebCore/bindings/js \
15
15
        -I$(srcdir)/WebCore/bridge \
16
16
        -I$(srcdir)/WebCore/bridge/c \
 
17
        -I$(srcdir)/WebCore/bridge/jni/jsc \
17
18
        -I$(srcdir)/WebCore/css \
18
19
        -I$(srcdir)/WebCore/dom \
19
20
        -I$(srcdir)/WebCore/dom/default \
41
42
        -I$(srcdir)/WebCore/platform/image-decoders/ico \
42
43
        -I$(srcdir)/WebCore/platform/image-decoders/jpeg \
43
44
        -I$(srcdir)/WebCore/platform/image-decoders/png \
44
 
        -I$(srcdir)/WebCore/platform/image-decoders/xbm \
45
45
        -I$(srcdir)/WebCore/platform/mock \
46
46
        -I$(srcdir)/WebCore/platform/network \
47
47
        -I$(srcdir)/WebCore/platform/sql \
87
87
        DerivedSources/JSHTMLElementWrapperFactory.cpp \
88
88
        DerivedSources/UserAgentStyleSheets.h \
89
89
        DerivedSources/UserAgentStyleSheetsData.cpp \
 
90
        DerivedSources/XMLNSNames.cpp \
90
91
        DerivedSources/XMLNames.cpp
91
92
 
92
93
IDL_BINDINGS += \
491
492
        WebCore/bindings/js/SerializedScriptValue.h \
492
493
        WebCore/bindings/js/StringSourceProvider.h \
493
494
        WebCore/bindings/ScriptControllerBase.cpp \
 
495
        WebCore/bridge/Bridge.cpp \
 
496
        WebCore/bridge/Bridge.h \
494
497
        WebCore/bridge/IdentifierRep.cpp \
495
498
        WebCore/bridge/IdentifierRep.h \
496
499
        WebCore/bridge/NP_jsobject.cpp \
503
506
        WebCore/bridge/c/c_runtime.h \
504
507
        WebCore/bridge/c/c_utility.cpp \
505
508
        WebCore/bridge/c/c_utility.h \
506
 
        WebCore/bridge/jni/jni_class.h \
507
 
        WebCore/bridge/jni/jni_instance.h \
 
509
        WebCore/bridge/jni/JNIUtility.h \
508
510
        WebCore/bridge/jni/jni_jsobject.h \
509
511
        WebCore/bridge/jni/jni_runtime.h \
510
 
        WebCore/bridge/jni/jni_utility.h \
 
512
        WebCore/bridge/jni/jsc/JavaClassJSC.h \
 
513
        WebCore/bridge/jni/jsc/JavaInstanceJSC.h \
511
514
        WebCore/bridge/npapi.h \
512
515
        WebCore/bridge/npruntime.cpp \
513
516
        WebCore/bridge/npruntime.h \
514
517
        WebCore/bridge/npruntime_impl.h \
515
518
        WebCore/bridge/npruntime_internal.h \
516
519
        WebCore/bridge/npruntime_priv.h \
517
 
        WebCore/bridge/runtime.cpp \
518
 
        WebCore/bridge/runtime.h \
519
520
        WebCore/bridge/runtime_array.cpp \
520
521
        WebCore/bridge/runtime_array.h \
521
522
        WebCore/bridge/runtime_method.cpp \
950
951
        WebCore/history/HistoryItem.h \
951
952
        WebCore/history/PageCache.cpp \
952
953
        WebCore/history/PageCache.h \
 
954
        WebCore/html/canvas/CanvasContextAttributes.h \
953
955
        WebCore/html/canvas/CanvasGradient.cpp \
954
956
        WebCore/html/canvas/CanvasGradient.h \
955
957
        WebCore/html/canvas/CanvasPattern.cpp \
1111
1113
        WebCore/html/HTMLQuoteElement.h \
1112
1114
        WebCore/html/HTMLScriptElement.cpp \
1113
1115
        WebCore/html/HTMLScriptElement.h \
1114
 
        WebCore/html/HTMLNoScriptElement.cpp \
1115
 
        WebCore/html/HTMLNoScriptElement.h \
1116
1116
        WebCore/html/HTMLSelectElement.cpp \
1117
1117
        WebCore/html/HTMLSelectElement.h \
1118
1118
        WebCore/html/HTMLStyleElement.cpp \
1555
1555
        WebCore/platform/graphics/GraphicsContext.cpp \
1556
1556
        WebCore/platform/graphics/GraphicsContext.h \
1557
1557
        WebCore/platform/graphics/GraphicsContextPrivate.h \
 
1558
        WebCore/platform/graphics/GraphicsLayer.h \
1558
1559
        WebCore/platform/graphics/GraphicsTypes.cpp \
1559
1560
        WebCore/platform/graphics/GraphicsTypes.h \
1560
1561
        WebCore/platform/graphics/Icon.h \
1588
1589
        WebCore/platform/graphics/StrokeStyleApplier.h \
1589
1590
        WebCore/platform/graphics/TextRenderingMode.h \
1590
1591
        WebCore/platform/graphics/TextRun.h \
 
1592
        WebCore/platform/graphics/TypesettingFeatures.h \
1591
1593
        WebCore/platform/graphics/UnitBezier.h \
1592
1594
        WebCore/platform/graphics/WidthIterator.cpp \
1593
1595
        WebCore/platform/graphics/WidthIterator.h \
1710
1712
        WebCore/plugins/PluginQuirkSet.h \
1711
1713
        WebCore/plugins/PluginStream.cpp \
1712
1714
        WebCore/plugins/PluginStream.h \
 
1715
        WebCore/plugins/PluginWidget.h \
1713
1716
        WebCore/plugins/PluginView.cpp \
1714
1717
        WebCore/plugins/PluginView.h \
1715
1718
        WebCore/plugins/npapi.cpp \
1756
1759
        WebCore/rendering/RenderCounter.h \
1757
1760
        WebCore/rendering/RenderDataGrid.cpp \
1758
1761
        WebCore/rendering/RenderDataGrid.h \
 
1762
        WebCore/rendering/RenderEmbeddedObject.cpp \
 
1763
        WebCore/rendering/RenderEmbeddedObject.h \
1759
1764
        WebCore/rendering/RenderFieldset.cpp \
1760
1765
        WebCore/rendering/RenderFieldset.h \
1761
1766
        WebCore/rendering/RenderFileUploadControl.cpp \
1857
1862
        WebCore/rendering/TableLayout.h \
1858
1863
        WebCore/rendering/TextControlInnerElements.cpp \
1859
1864
        WebCore/rendering/TextControlInnerElements.h \
 
1865
        WebCore/rendering/TrailingFloatsRootInlineBox.h \
1860
1866
        WebCore/rendering/TransformState.cpp \
1861
1867
        WebCore/rendering/TransformState.h \
1862
1868
        WebCore/rendering/break_lines.cpp \
1981
1987
        WebCore/platform/gtk/ContextMenuItemGtk.cpp \
1982
1988
        WebCore/platform/gtk/CursorGtk.cpp \
1983
1989
        WebCore/platform/gtk/CursorGtk.h \
 
1990
        WebCore/platform/gtk/DataObjectGtk.cpp \
1984
1991
        WebCore/platform/gtk/DataObjectGtk.h \
1985
 
        WebCore/platform/gtk/DataObjectGtk.cpp \
1986
1992
        WebCore/platform/gtk/DragDataGtk.cpp \
1987
1993
        WebCore/platform/gtk/DragImageGtk.cpp \
1988
1994
        WebCore/platform/gtk/EventLoopGtk.cpp \
2036
2042
        WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h \
2037
2043
        WebCore/platform/image-decoders/png/PNGImageDecoder.cpp \
2038
2044
        WebCore/platform/image-decoders/png/PNGImageDecoder.h \
2039
 
        WebCore/platform/image-decoders/xbm/XBMImageDecoder.cpp \
2040
 
        WebCore/platform/image-decoders/xbm/XBMImageDecoder.h \
2041
2045
        WebCore/platform/network/soup/AuthenticationChallenge.h \
2042
2046
        WebCore/platform/network/soup/CookieJarSoup.cpp \
2043
2047
        WebCore/platform/network/soup/CookieJarSoup.h \
2398
2402
endif # END ENABLE_VIDEO
2399
2403
 
2400
2404
# ----
 
2405
# XHTML-MP Support
 
2406
# ----
 
2407
if ENABLE_XHTMLMP
 
2408
FEATURE_DEFINES_JAVASCRIPT += ENABLE_XHTMLMP=1
 
2409
 
 
2410
webcore_cppflags += -DENABLE_XHTMLMP=1
 
2411
 
 
2412
webcore_sources += \
 
2413
        WebCore/html/HTMLNoScriptElement.cpp \
 
2414
        WebCore/html/HTMLNoScriptElement.h
 
2415
endif # END ENABLE_XHTMLMP
 
2416
 
 
2417
# ----
2401
2418
# XPath Support
2402
2419
# ----
2403
2420
if ENABLE_XPATH
2904
2921
        WebCore/bindings/js/JSSVGElementInstanceCustom.cpp \
2905
2922
        WebCore/bindings/js/JSSVGLengthCustom.cpp \
2906
2923
        WebCore/bindings/js/JSSVGMatrixCustom.cpp \
 
2924
        WebCore/bindings/js/JSSVGPODListCustom.h \
2907
2925
        WebCore/bindings/js/JSSVGPODTypeWrapper.h \
2908
2926
        WebCore/bindings/js/JSSVGPathSegCustom.cpp \
2909
2927
        WebCore/bindings/js/JSSVGPathSegListCustom.cpp \
2910
 
        WebCore/bindings/js/JSSVGPointListCustom.cpp \
2911
 
        WebCore/bindings/js/JSSVGTransformListCustom.cpp \
2912
2928
        WebCore/css/SVGCSSComputedStyleDeclaration.cpp \
2913
2929
        WebCore/css/SVGCSSParser.cpp \
2914
2930
        WebCore/css/SVGCSSStyleSelector.cpp \
2936
2952
        WebCore/rendering/RenderSVGModelObject.h \
2937
2953
        WebCore/rendering/RenderSVGRoot.cpp \
2938
2954
        WebCore/rendering/RenderSVGRoot.h \
 
2955
        WebCore/rendering/RenderSVGShadowTreeRootContainer.cpp \
 
2956
        WebCore/rendering/RenderSVGShadowTreeRootContainer.h \
2939
2957
        WebCore/rendering/RenderSVGTSpan.cpp \
2940
2958
        WebCore/rendering/RenderSVGTSpan.h \
2941
2959
        WebCore/rendering/RenderSVGText.cpp \
2952
2970
        WebCore/rendering/SVGInlineFlowBox.h \
2953
2971
        WebCore/rendering/SVGInlineTextBox.cpp \
2954
2972
        WebCore/rendering/SVGInlineTextBox.h \
 
2973
        WebCore/rendering/SVGMarkerData.h \
 
2974
        WebCore/rendering/SVGMarkerLayoutInfo.cpp \
 
2975
        WebCore/rendering/SVGMarkerLayoutInfo.h \
2955
2976
        WebCore/rendering/SVGRenderSupport.cpp \
2956
2977
        WebCore/rendering/SVGRenderSupport.h \
2957
2978
        WebCore/rendering/SVGRenderTreeAsText.cpp \
2958
2979
        WebCore/rendering/SVGRenderTreeAsText.h \
2959
2980
        WebCore/rendering/SVGRootInlineBox.cpp \
2960
2981
        WebCore/rendering/SVGRootInlineBox.h \
 
2982
        WebCore/rendering/SVGShadowTreeElements.cpp \
 
2983
        WebCore/rendering/SVGShadowTreeElements.h \
2961
2984
        WebCore/rendering/style/SVGRenderStyle.cpp \
2962
2985
        WebCore/rendering/style/SVGRenderStyle.h \
2963
2986
        WebCore/rendering/style/SVGRenderStyleDefs.cpp \
3385
3408
        WebCore/websockets/WebSocketHandshake.cpp \
3386
3409
        WebCore/websockets/WebSocketHandshake.h
3387
3410
 
 
3411
if ENABLE_WORKERS
 
3412
webcore_sources += \
 
3413
        WebCore/websockets/ThreadableWebSocketChannel.cpp \
 
3414
        WebCore/websockets/ThreadableWebSocketChannel.h \
 
3415
        WebCore/websockets/ThreadableWebSocketChannelClientWrapper.h \
 
3416
        WebCore/websockets/WorkerThreadableWebSocketChannel.cpp \
 
3417
        WebCore/websockets/WorkerThreadableWebSocketChannel.h
 
3418
endif
 
3419
 
3388
3420
webcoregtk_sources += \
3389
3421
        WebCore/platform/network/soup/SocketStreamError.h \
3390
3422
        WebCore/platform/network/soup/SocketStreamHandle.h \
3475
3507
 
3476
3508
DerivedSources/JSHTMLElementWrapperFactory.cpp: DerivedSources/HTMLNames.cpp;
3477
3509
 
 
3510
DerivedSources/XMLNSNames.cpp: $(WebCore)/dom/make_names.pl $(WebCore)/xml/xmlnsattrs.in
 
3511
        $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $< --attrs $(WebCore)/xml/xmlnsattrs.in --outputDir "$(GENSOURCES)"
 
3512
 
3478
3513
DerivedSources/XMLNames.cpp: $(WebCore)/dom/make_names.pl $(WebCore)/xml/xmlattrs.in
3479
3514
        $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $< --attrs $(WebCore)/xml/xmlattrs.in --outputDir "$(GENSOURCES)"
3480
3515
 
3525
3560
 
3526
3561
webcore_built_nosources += $(patsubst %.idl,DerivedSources/JS%.cpp,$(notdir $(IDL_BINDINGS_JS)))
3527
3562
 
 
3563
webcore_built_objects = := $(patsubst %.cpp,%.lo,$(webcore_built_nosources))
 
3564
 
 
3565
$(webcore_built_objects): AM_CPPFLAGS+=$(corekit_cppflags)
 
3566
 
 
3567
$(webcore_built_objects): AM_CXXFLAGS+=$(libwebkit_1_0_la_CXXFLAGS)
 
3568
 
3528
3569
libWebCoreJS_objects := $(patsubst %.idl,DerivedSources/JS%.lo,$(notdir $(IDL_BINDINGS_JS)))
3529
3570
 
3530
3571
libWebCoreJS_depfiles := $(patsubst %.idl,DerivedSources/$(DEPDIR)/JS%.Plo,$(notdir $(IDL_BINDINGS_JS)))
3534
3575
 
3535
3576
-include $(libWebCoreJS_depfiles)
3536
3577
 
3537
 
$(libWebCoreJS_objects): AM_CPPFLAGS+=$(libWebCore_la_CPPFLAGS)
 
3578
$(libWebCoreJS_objects): AM_CPPFLAGS+=$(corekit_cppflags)
3538
3579
 
3539
 
$(libWebCoreJS_objects): AM_CXXFLAGS+=$(libWebCore_la_CXXFLAGS)
 
3580
$(libWebCoreJS_objects): AM_CXXFLAGS+=$(libwebkit_1_0_la_CXXFLAGS)
3540
3581
 
3541
3582
libWebCoreJS.la: $(libWebCoreJS_objects)
3542
3583
        $(CXXLINK) $(libWebCoreJS_objects) $(LIBS)
3587
3628
        WebCore/html/HTMLEntityNames.gperf \
3588
3629
        WebCore/html/HTMLAttributeNames.in \
3589
3630
        WebCore/xml/xmlattrs.in \
 
3631
        WebCore/xml/xmlnsattrs.in \
3590
3632
        WebCore/xml/XPathGrammar.y
3591
3633
 
3592
3634
# Installing web inspector files