Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(108)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: WebCore/GNUmakefile.am

Issue 3364013: Merge 67001 - 2010-09-08 Peter Kasting <pkasting@google.com>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/517/
Patch Set: Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « WebCore/ChangeLog ('k') | WebCore/WebCore.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 SVG_FEATURES := 1 SVG_FEATURES :=
2 HTML_FEATURES := 2 HTML_FEATURES :=
3 3
4 WEBCORE_CSS_PROPERTY_NAMES := $(WebCore)/css/CSSPropertyNames.in 4 WEBCORE_CSS_PROPERTY_NAMES := $(WebCore)/css/CSSPropertyNames.in
5 WEBCORE_CSS_VALUE_KEYWORDS := $(WebCore)/css/CSSValueKeywords.in 5 WEBCORE_CSS_VALUE_KEYWORDS := $(WebCore)/css/CSSValueKeywords.in
6 6
7 webcore_cppflags += \ 7 webcore_cppflags += \
8 -I$(srcdir)/WebCore \ 8 -I$(srcdir)/WebCore \
9 -I$(srcdir)/WebCore/accessibility \ 9 -I$(srcdir)/WebCore/accessibility \
10 -I$(srcdir)/WebCore/bindings/generic \ 10 -I$(srcdir)/WebCore/bindings/generic \
(...skipping 1931 matching lines...) Expand 10 before | Expand all | Expand 10 after
1942 WebCore/platform/PlatformKeyboardEvent.h \ 1942 WebCore/platform/PlatformKeyboardEvent.h \
1943 WebCore/platform/PlatformMenuDescription.h \ 1943 WebCore/platform/PlatformMenuDescription.h \
1944 WebCore/platform/PlatformMouseEvent.h \ 1944 WebCore/platform/PlatformMouseEvent.h \
1945 WebCore/platform/PlatformScreen.h \ 1945 WebCore/platform/PlatformScreen.h \
1946 WebCore/platform/PlatformWheelEvent.h \ 1946 WebCore/platform/PlatformWheelEvent.h \
1947 WebCore/platform/PopupMenu.h \ 1947 WebCore/platform/PopupMenu.h \
1948 WebCore/platform/PopupMenuClient.h \ 1948 WebCore/platform/PopupMenuClient.h \
1949 WebCore/platform/PopupMenuStyle.h \ 1949 WebCore/platform/PopupMenuStyle.h \
1950 WebCore/platform/PurgeableBuffer.h \ 1950 WebCore/platform/PurgeableBuffer.h \
1951 WebCore/platform/SSLKeyGenerator.h \ 1951 WebCore/platform/SSLKeyGenerator.h \
1952 WebCore/platform/ScrollAnimator.cpp \
1953 WebCore/platform/ScrollAnimator.h \
1952 WebCore/platform/ScrollTypes.h \ 1954 WebCore/platform/ScrollTypes.h \
1953 WebCore/platform/ScrollView.cpp \ 1955 WebCore/platform/ScrollView.cpp \
1954 WebCore/platform/ScrollView.h \ 1956 WebCore/platform/ScrollView.h \
1955 WebCore/platform/SchemeRegistry.cpp \ 1957 WebCore/platform/SchemeRegistry.cpp \
1956 WebCore/platform/SchemeRegistry.h \ 1958 WebCore/platform/SchemeRegistry.h \
1957 WebCore/platform/Scrollbar.cpp \ 1959 WebCore/platform/Scrollbar.cpp \
1958 WebCore/platform/Scrollbar.h \ 1960 WebCore/platform/Scrollbar.h \
1961 WebCore/platform/ScrollbarClient.cpp \
1959 WebCore/platform/ScrollbarClient.h \ 1962 WebCore/platform/ScrollbarClient.h \
1960 WebCore/platform/ScrollbarTheme.h \ 1963 WebCore/platform/ScrollbarTheme.h \
1961 WebCore/platform/ScrollbarThemeComposite.cpp \ 1964 WebCore/platform/ScrollbarThemeComposite.cpp \
1962 WebCore/platform/ScrollbarThemeComposite.h \ 1965 WebCore/platform/ScrollbarThemeComposite.h \
1963 WebCore/platform/SearchPopupMenu.h \ 1966 WebCore/platform/SearchPopupMenu.h \
1964 WebCore/platform/SecureTextInput.h \ 1967 WebCore/platform/SecureTextInput.h \
1965 WebCore/platform/SharedBuffer.cpp \ 1968 WebCore/platform/SharedBuffer.cpp \
1966 WebCore/platform/SharedBuffer.h \ 1969 WebCore/platform/SharedBuffer.h \
1967 WebCore/platform/SharedTimer.h \ 1970 WebCore/platform/SharedTimer.h \
1968 WebCore/platform/Sound.h \ 1971 WebCore/platform/Sound.h \
(...skipping 592 matching lines...) Expand 10 before | Expand all | Expand 10 after
2561 2564
2562 if TARGET_X11 2565 if TARGET_X11
2563 webcoregtk_sources += \ 2566 webcoregtk_sources += \
2564 WebCore/plugins/gtk/gtk2xtbin.c \ 2567 WebCore/plugins/gtk/gtk2xtbin.c \
2565 WebCore/plugins/gtk/gtk2xtbin.h \ 2568 WebCore/plugins/gtk/gtk2xtbin.h \
2566 WebCore/plugins/gtk/xembed.h 2569 WebCore/plugins/gtk/xembed.h
2567 endif 2570 endif
2568 2571
2569 if TARGET_WIN32 2572 if TARGET_WIN32
2570 webcore_sources += \ 2573 webcore_sources += \
2574 WebCore/platform/ScrollAnimatorWin.cpp \
2575 WebCore/platform/ScrollAnimatorWin.h \
2571 WebCore/plugins/win/PluginDatabaseWin.cpp \ 2576 WebCore/plugins/win/PluginDatabaseWin.cpp \
2572 WebCore/plugins/win/PluginMessageThrottlerWin.cpp \ 2577 WebCore/plugins/win/PluginMessageThrottlerWin.cpp \
2573 WebCore/plugins/win/PluginMessageThrottlerWin.h 2578 WebCore/plugins/win/PluginMessageThrottlerWin.h
2574 endif 2579 endif
2575 2580
2576 # ---- 2581 # ----
2577 # icu unicode backend 2582 # icu unicode backend
2578 # ---- 2583 # ----
2579 if USE_ICU_UNICODE 2584 if USE_ICU_UNICODE
2580 webcoregtk_sources += \ 2585 webcoregtk_sources += \
(...skipping 2089 matching lines...) Expand 10 before | Expand all | Expand 10 after
4670 $(WebCore)/Resources/urlIcon.png \ 4675 $(WebCore)/Resources/urlIcon.png \
4671 $(WebCore)/Resources/missingImage.png \ 4676 $(WebCore)/Resources/missingImage.png \
4672 $(WebCore)/Resources/panIcon.png \ 4677 $(WebCore)/Resources/panIcon.png \
4673 $(WebCore)/Resources/deleteButton.png \ 4678 $(WebCore)/Resources/deleteButton.png \
4674 $(WebCore)/Resources/inputSpeech.png 4679 $(WebCore)/Resources/inputSpeech.png
4675 4680
4676 # Clean rules for WebCore 4681 # Clean rules for WebCore
4677 4682
4678 CLEANFILES += \ 4683 CLEANFILES += \
4679 libWebCoreJS.la 4684 libWebCoreJS.la
OLDNEW
« no previous file with comments | « WebCore/ChangeLog ('k') | WebCore/WebCore.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698