Changeset 89251 in webkit
- Timestamp:
- Jun 20, 2011 9:40:08 AM (13 years ago)
- Location:
- trunk/Source
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r89250 r89251 1 2011-06-20 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 Reviewed by Xan Lopez. 4 5 [GTK] Split libWebCore into two libWebCore and libWebCoreGtk 6 https://bugs.webkit.org/show_bug.cgi?id=60539 7 8 libWebCore contains all the webcore files except the ones actually 9 using gtk while libWebCoreGtk contains only the files using 10 gtk. It allows us to build a common WebCore lib and two different 11 gtk WebCore libs depending on the gtk version. In WeKit2 gtk2 is 12 not supported, but the plugin process needs to be built using gtk2 13 because plugins like flash still use gtk2. For WebKit2, we build 14 the common libWebCore and two libWebCoreGtk, one using gtk3 and 15 the other one using gtk2. 16 17 * GNUmakefile.am: 18 * GNUmakefile.list.am: 19 1 20 2011-06-20 Mike Reed <reed@google.com> 2 21 -
trunk/Source/WebCore/GNUmakefile.am
r89227 r89251 753 753 754 754 libWebCore_la_SOURCES = \ 755 $(webcore_sources) \ 756 $(webcoregtk_sources) 755 $(webcore_sources) 757 756 758 757 libWebCore_la_CXXFLAGS = \ … … 765 764 766 765 libWebCore_la_CPPFLAGS = \ 766 -DBUILDING_WEBKIT \ 767 $(global_cppflags) \ 768 $(webcore_cppflags) \ 769 $(webcoregtk_cppflags) \ 770 $(javascriptcore_cppflags) \ 771 -fno-strict-aliasing \ 772 $(CAIRO_CFLAGS) \ 773 $(COVERAGE_CFLAGS) \ 774 $(ENCHANT_CFLAGS) \ 775 $(GEOCLUE_CFLAGS) \ 776 $(GLIB_CFLAGS) \ 777 $(GSTREAMER_CFLAGS) \ 778 $(LIBSOUP_CFLAGS) \ 779 $(LIBXML_CFLAGS) \ 780 $(LIBXSLT_CFLAGS) \ 781 $(SQLITE3_CFLAGS) \ 782 $(UNICODE_CFLAGS) \ 783 $(XRENDER_CFLAGS) \ 784 $(XT_CFLAGS) 785 786 # We have a different library with only the files that require GTK+. It allows us 787 # to build a common WebCore lib and two different gtk WebCore libs depending on 788 # the gtk version. In WeKit2 gtk2 is not supported, but the plugin process needs to 789 # be built using gtk2 because plugins like flash still use gtk2. For WebKit2, we build 790 # the common libWebCore and two libWebCoreGtk, one using gtk3 and the other one using gtk2. 791 noinst_LTLIBRARIES += \ 792 libWebCoreGtk.la 793 794 libWebCoreGtk_la_SOURCES = \ 795 $(webcoregtk_sources) 796 797 libWebCoreGtk_la_CXXFLAGS = \ 798 $(SYMBOL_VISIBILITY_INLINES) \ 799 $(global_cxxflags) 800 801 libWebCoreGtk_la_CFLAGS = \ 802 $(SYMBOL_VISIBILITY) \ 803 $(global_cflags) 804 805 libWebCoreGtk_la_CPPFLAGS = \ 767 806 -DBUILDING_WEBKIT \ 768 807 $(global_cppflags) \ -
trunk/Source/WebCore/GNUmakefile.list.am
r89220 r89251 1366 1366 Source/WebCore/editing/FrameSelection.cpp \ 1367 1367 Source/WebCore/editing/FrameSelection.h \ 1368 Source/WebCore/editing/gtk/FrameSelectionGtk.cpp \1369 1368 Source/WebCore/editing/htmlediting.cpp \ 1370 1369 Source/WebCore/editing/htmlediting.h \ … … 2388 2387 Source/WebCore/platform/graphics/ContextShadow.h \ 2389 2388 Source/WebCore/platform/graphics/DashArray.h \ 2389 Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp \ 2390 Source/WebCore/platform/graphics/cairo/CairoUtilities.h \ 2391 Source/WebCore/platform/graphics/cairo/ContextShadowCairo.cpp \ 2392 Source/WebCore/platform/graphics/cairo/FloatRectCairo.cpp \ 2393 Source/WebCore/platform/graphics/cairo/FontCairo.cpp \ 2394 Source/WebCore/platform/graphics/cairo/FontCustomPlatformData.h \ 2395 Source/WebCore/platform/graphics/cairo/GradientCairo.cpp \ 2396 Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp \ 2397 Source/WebCore/platform/graphics/cairo/ImageBufferDataCairo.h \ 2398 Source/WebCore/platform/graphics/cairo/ImageCairo.cpp \ 2399 Source/WebCore/platform/graphics/cairo/IntRectCairo.cpp \ 2400 Source/WebCore/platform/graphics/cairo/OwnPtrCairo.cpp \ 2401 Source/WebCore/platform/graphics/cairo/OwnPtrCairo.h \ 2402 Source/WebCore/platform/graphics/cairo/PathCairo.cpp \ 2403 Source/WebCore/platform/graphics/cairo/PatternCairo.cpp \ 2404 Source/WebCore/platform/graphics/cairo/PlatformContextCairo.cpp \ 2405 Source/WebCore/platform/graphics/cairo/PlatformContextCairo.h \ 2406 Source/WebCore/platform/graphics/cairo/PlatformPathCairo.h \ 2407 Source/WebCore/platform/graphics/cairo/PlatformPathCairo.cpp \ 2408 Source/WebCore/platform/graphics/cairo/RefPtrCairo.cpp \ 2409 Source/WebCore/platform/graphics/cairo/RefPtrCairo.h \ 2410 Source/WebCore/platform/graphics/cairo/TransformationMatrixCairo.cpp \ 2390 2411 Source/WebCore/platform/graphics/filters/DistantLightSource.cpp \ 2391 2412 Source/WebCore/platform/graphics/filters/DistantLightSource.h \ … … 2556 2577 Source/WebCore/platform/graphics/WOFFFileFormat.cpp \ 2557 2578 Source/WebCore/platform/graphics/WOFFFileFormat.h \ 2579 Source/WebCore/platform/gtk/KURLGtk.cpp \ 2580 Source/WebCore/platform/gtk/LanguageGtk.cpp \ 2581 Source/WebCore/platform/gtk/LoggingGtk.cpp \ 2582 Source/WebCore/platform/gtk/MIMETypeRegistryGtk.cpp \ 2583 Source/WebCore/platform/gtk/SharedBufferGtk.cpp \ 2584 Source/WebCore/platform/gtk/TemporaryLinkStubs.cpp \ 2558 2585 Source/WebCore/platform/HostWindow.h \ 2559 2586 Source/WebCore/platform/KillRing.h \ … … 2586 2613 Source/WebCore/platform/MemoryPressureHandler.cpp \ 2587 2614 Source/WebCore/platform/MemoryPressureHandler.h \ 2615 Source/WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp \ 2616 Source/WebCore/platform/image-decoders/bmp/BMPImageDecoder.h \ 2617 Source/WebCore/platform/image-decoders/bmp/BMPImageReader.cpp \ 2618 Source/WebCore/platform/image-decoders/bmp/BMPImageReader.h \ 2619 Source/WebCore/platform/image-decoders/cairo/ImageDecoderCairo.cpp \ 2620 Source/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp \ 2621 Source/WebCore/platform/image-decoders/gif/GIFImageDecoder.h \ 2622 Source/WebCore/platform/image-decoders/gif/GIFImageReader.cpp \ 2623 Source/WebCore/platform/image-decoders/gif/GIFImageReader.h \ 2624 Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp \ 2625 Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.h \ 2626 Source/WebCore/platform/image-decoders/ImageDecoder.cpp \ 2627 Source/WebCore/platform/image-decoders/ImageDecoder.h \ 2628 Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp \ 2629 Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h \ 2630 Source/WebCore/platform/image-decoders/webp/WEBPImageDecoder.cpp \ 2631 Source/WebCore/platform/image-decoders/webp/WEBPImageDecoder.h \ 2632 Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp \ 2633 Source/WebCore/platform/image-decoders/png/PNGImageDecoder.h \ 2588 2634 Source/WebCore/platform/mock/DeviceOrientationClientMock.cpp \ 2589 2635 Source/WebCore/platform/mock/DeviceOrientationClientMock.h \ … … 2647 2693 Source/WebCore/platform/network/SocketStreamHandleBase.h \ 2648 2694 Source/WebCore/platform/network/SocketStreamHandleClient.h \ 2695 Source/WebCore/platform/network/soup/AuthenticationChallenge.h \ 2696 Source/WebCore/platform/network/soup/CookieJarSoup.cpp \ 2697 Source/WebCore/platform/network/soup/CookieJarSoup.h \ 2698 Source/WebCore/platform/network/soup/CredentialStorageSoup.cpp \ 2699 Source/WebCore/platform/network/soup/CredentialStorageSoup.h \ 2700 Source/WebCore/platform/network/soup/GOwnPtrSoup.cpp \ 2701 Source/WebCore/platform/network/soup/GOwnPtrSoup.h \ 2702 Source/WebCore/platform/network/soup/ProxyServerSoup.cpp \ 2703 Source/WebCore/platform/network/soup/ResourceError.h \ 2704 Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp \ 2705 Source/WebCore/platform/network/soup/ResourceRequest.h \ 2706 Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp \ 2707 Source/WebCore/platform/network/soup/ResourceResponse.h \ 2708 Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp \ 2709 Source/WebCore/platform/network/soup/SocketStreamError.h \ 2710 Source/WebCore/platform/network/soup/SocketStreamHandle.h \ 2711 Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp \ 2712 Source/WebCore/platform/network/soup/SoupURIUtils.cpp \ 2713 Source/WebCore/platform/network/soup/SoupURIUtils.h \ 2649 2714 Source/WebCore/platform/NotImplemented.h \ 2650 2715 Source/WebCore/platform/Pasteboard.h \ … … 2794 2859 Source/WebCore/plugins/PluginView.cpp \ 2795 2860 Source/WebCore/plugins/PluginView.h \ 2861 Source/WebCore/plugins/gtk/PluginDataGtk.cpp \ 2796 2862 Source/WebCore/rendering/AutoTableLayout.cpp \ 2797 2863 Source/WebCore/rendering/AutoTableLayout.h \ … … 3743 3809 Source/WebCore/xml/XSLTUnicodeSort.h 3744 3810 3811 # WebCore files that use GTK/GDK or any other dependency that requires GTK+. 3745 3812 webcoregtk_sources += \ 3746 3813 Source/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp \ … … 3751 3818 Source/WebCore/accessibility/gtk/WebKitAccessibleHyperlink.cpp \ 3752 3819 Source/WebCore/bindings/js/ScriptControllerGtk.cpp \ 3820 Source/WebCore/editing/gtk/FrameSelectionGtk.cpp \ 3753 3821 Source/WebCore/page/gtk/DragControllerGtk.cpp \ 3754 3822 Source/WebCore/page/gtk/EventHandlerGtk.cpp \ 3755 3823 Source/WebCore/page/gtk/FrameGtk.cpp \ 3756 Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp \3757 Source/WebCore/platform/graphics/cairo/CairoUtilities.h \3758 Source/WebCore/platform/graphics/cairo/ContextShadowCairo.cpp \3759 Source/WebCore/platform/graphics/cairo/FloatRectCairo.cpp \3760 Source/WebCore/platform/graphics/cairo/FontCairo.cpp \3761 Source/WebCore/platform/graphics/cairo/FontCustomPlatformData.h \3762 Source/WebCore/platform/graphics/cairo/GradientCairo.cpp \3763 3824 Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp \ 3764 3825 Source/WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h \ 3765 Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp \3766 Source/WebCore/platform/graphics/cairo/ImageBufferDataCairo.h \3767 Source/WebCore/platform/graphics/cairo/ImageCairo.cpp \3768 Source/WebCore/platform/graphics/cairo/IntRectCairo.cpp \3769 Source/WebCore/platform/graphics/cairo/OwnPtrCairo.cpp \3770 Source/WebCore/platform/graphics/cairo/OwnPtrCairo.h \3771 Source/WebCore/platform/graphics/cairo/PathCairo.cpp \3772 Source/WebCore/platform/graphics/cairo/PatternCairo.cpp \3773 Source/WebCore/platform/graphics/cairo/PlatformContextCairo.cpp \3774 Source/WebCore/platform/graphics/cairo/PlatformContextCairo.h \3775 Source/WebCore/platform/graphics/cairo/PlatformPathCairo.h \3776 Source/WebCore/platform/graphics/cairo/PlatformPathCairo.cpp \3777 Source/WebCore/platform/graphics/cairo/RefPtrCairo.cpp \3778 Source/WebCore/platform/graphics/cairo/RefPtrCairo.h \3779 Source/WebCore/platform/graphics/cairo/TransformationMatrixCairo.cpp \3780 3826 Source/WebCore/platform/graphics/gstreamer/GOwnPtrGStreamer.cpp \ 3781 3827 Source/WebCore/platform/graphics/gstreamer/GOwnPtrGStreamer.h \ … … 3840 3886 Source/WebCore/platform/gtk/KeyBindingTranslator.cpp \ 3841 3887 Source/WebCore/platform/gtk/KeyBindingTranslator.h \ 3842 Source/WebCore/platform/gtk/KURLGtk.cpp \3843 Source/WebCore/platform/gtk/LanguageGtk.cpp \3844 3888 Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp \ 3845 Source/WebCore/platform/gtk/LoggingGtk.cpp \3846 3889 Source/WebCore/platform/gtk/MainFrameScrollbarGtk.cpp \ 3847 3890 Source/WebCore/platform/gtk/MainFrameScrollbarGtk.h \ 3848 Source/WebCore/platform/gtk/MIMETypeRegistryGtk.cpp \3849 3891 Source/WebCore/platform/gtk/PasteboardGtk.cpp \ 3850 3892 Source/WebCore/platform/gtk/PasteboardHelper.cpp \ … … 3867 3909 Source/WebCore/platform/gtk/SearchPopupMenuGtk.cpp \ 3868 3910 Source/WebCore/platform/gtk/SearchPopupMenuGtk.h \ 3869 Source/WebCore/platform/gtk/SharedBufferGtk.cpp \3870 3911 Source/WebCore/platform/gtk/SharedTimerGtk.cpp \ 3871 3912 Source/WebCore/platform/gtk/SoundGtk.cpp \ 3872 Source/WebCore/platform/gtk/TemporaryLinkStubs.cpp \3873 3913 Source/WebCore/platform/gtk/WidgetGtk.cpp \ 3874 3914 Source/WebCore/platform/gtk/WidgetRenderingContext.cpp \ 3875 3915 Source/WebCore/platform/gtk/WidgetRenderingContext.h \ 3876 Source/WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp \3877 Source/WebCore/platform/image-decoders/bmp/BMPImageDecoder.h \3878 Source/WebCore/platform/image-decoders/bmp/BMPImageReader.cpp \3879 Source/WebCore/platform/image-decoders/bmp/BMPImageReader.h \3880 Source/WebCore/platform/image-decoders/cairo/ImageDecoderCairo.cpp \3881 Source/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp \3882 Source/WebCore/platform/image-decoders/gif/GIFImageDecoder.h \3883 Source/WebCore/platform/image-decoders/gif/GIFImageReader.cpp \3884 Source/WebCore/platform/image-decoders/gif/GIFImageReader.h \3885 Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp \3886 Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.h \3887 Source/WebCore/platform/image-decoders/ImageDecoder.cpp \3888 Source/WebCore/platform/image-decoders/ImageDecoder.h \3889 Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp \3890 Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h \3891 Source/WebCore/platform/image-decoders/webp/WEBPImageDecoder.cpp \3892 Source/WebCore/platform/image-decoders/webp/WEBPImageDecoder.h \3893 Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp \3894 Source/WebCore/platform/image-decoders/png/PNGImageDecoder.h \3895 Source/WebCore/platform/network/soup/AuthenticationChallenge.h \3896 Source/WebCore/platform/network/soup/CookieJarSoup.cpp \3897 Source/WebCore/platform/network/soup/CookieJarSoup.h \3898 Source/WebCore/platform/network/soup/CredentialStorageSoup.cpp \3899 Source/WebCore/platform/network/soup/GOwnPtrSoup.cpp \3900 Source/WebCore/platform/network/soup/GOwnPtrSoup.h \3901 Source/WebCore/platform/network/soup/ProxyServerSoup.cpp \3902 Source/WebCore/platform/network/soup/ResourceError.h \3903 Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp \3904 Source/WebCore/platform/network/soup/ResourceRequest.h \3905 Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp \3906 Source/WebCore/platform/network/soup/ResourceResponse.h \3907 Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp \3908 Source/WebCore/platform/network/soup/SocketStreamError.h \3909 Source/WebCore/platform/network/soup/SocketStreamHandle.h \3910 Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp \3911 Source/WebCore/platform/network/soup/SoupURIUtils.cpp \3912 Source/WebCore/platform/network/soup/SoupURIUtils.h \3913 Source/WebCore/plugins/gtk/PluginDataGtk.cpp \3914 3916 Source/WebCore/plugins/gtk/PluginPackageGtk.cpp \ 3915 3917 Source/WebCore/plugins/gtk/PluginViewGtk.cpp … … 3937 3939 # ---- 3938 3940 if USE_ICU_UNICODE 3939 webcore gtk_sources += \3941 webcore_sources += \ 3940 3942 Source/WebCore/platform/text/TextCodecICU.cpp \ 3941 3943 Source/WebCore/platform/text/TextCodecICU.h \ … … 3949 3951 # ---- 3950 3952 if USE_GLIB_UNICODE 3951 webcore gtk_sources += \3953 webcore_sources += \ 3952 3954 Source/WebCore/platform/text/gtk/TextCodecGtk.cpp \ 3953 3955 Source/WebCore/platform/text/gtk/TextCodecGtk.h \ … … 3959 3961 # --- 3960 3962 if USE_FREETYPE 3961 webcore gtk_sources += \3963 webcore_sources += \ 3962 3964 Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp \ 3963 3965 Source/WebCore/platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp \ 3964 Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp \3965 3966 Source/WebCore/platform/graphics/freetype/FontPlatformData.h \ 3966 3967 Source/WebCore/platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp \ 3967 3968 Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp 3969 webcoregtk_sources += \ 3970 Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 3968 3971 endif # END USE_FREETYPE 3969 3972 … … 3972 3975 # --- 3973 3976 if USE_PANGO 3974 webcore gtk_sources += \3977 webcore_sources += \ 3975 3978 Source/WebCore/platform/graphics/pango/FontCachePango.cpp \ 3976 3979 Source/WebCore/platform/graphics/pango/FontCustomPlatformDataPango.cpp \ -
trunk/Source/WebKit/gtk/ChangeLog
r89216 r89251 1 2011-06-20 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 Reviewed by Xan Lopez. 4 5 [GTK] Split libWebCore into two libWebCore and libWebCoreGtk 6 https://bugs.webkit.org/show_bug.cgi?id=60539 7 8 * GNUmakefile.am: Link to libWebCoreGtk.la too. 9 1 10 2011-06-18 Dimitri Glazkov <dglazkov@chromium.org> 2 11 -
trunk/Source/WebKit/gtk/GNUmakefile.am
r88935 r89251 82 82 -lpthread \ 83 83 libWebCore.la \ 84 libWebCoreGtk.la \ 84 85 libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \ 85 86 $(webcore_ldflags) \ -
trunk/Source/WebKit2/ChangeLog
r89231 r89251 1 2011-06-20 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 Reviewed by Xan Lopez. 4 5 [GTK] Split libWebCore into two libWebCore and libWebCoreGtk 6 https://bugs.webkit.org/show_bug.cgi?id=60539 7 8 * GNUmakefile.am: Link to libWebCoreGtk.la too. 9 1 10 2011-06-19 MORITA Hajime <morrita@google.com> 2 11 -
trunk/Source/WebKit2/GNUmakefile.am
r88960 r89251 813 813 libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD = \ 814 814 -lpthread \ 815 libWebCore.la \ 815 816 libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \ 816 libWebCore .la \817 libWebCoreGtk.la \ 817 818 $(CAIRO_LIBS) \ 818 819 $(COVERAGE_LDFLAGS) \
Note: See TracChangeset
for help on using the changeset viewer.