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

Side by Side Diff: Source/build/features.gypi

Issue 132723002: Remove compile time flag TOUCH_ICON_LOADING and use runtime flag instead. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix unit test case Created 6 years, 11 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
OLDNEW
1 # 1 #
2 # Copyright (C) 2009 Google Inc. All rights reserved. 2 # Copyright (C) 2009 Google Inc. All rights reserved.
3 # 3 #
4 # Redistribution and use in source and binary forms, with or without 4 # Redistribution and use in source and binary forms, with or without
5 # modification, are permitted provided that the following conditions are 5 # modification, are permitted provided that the following conditions are
6 # met: 6 # met:
7 # 7 #
8 # * Redistributions of source code must retain the above copyright 8 # * Redistributions of source code must retain the above copyright
9 # notice, this list of conditions and the following disclaimer. 9 # notice, this list of conditions and the following disclaimer.
10 # * Redistributions in binary form must reproduce the above 10 # * Redistributions in binary form must reproduce the above
(...skipping 26 matching lines...) Expand all
37 'ENABLE_GDI_FONTS_ON_WINDOWS=0', 37 'ENABLE_GDI_FONTS_ON_WINDOWS=0',
38 'ENABLE_HARFBUZZ_ON_WINDOWS=1', 38 'ENABLE_HARFBUZZ_ON_WINDOWS=1',
39 # WTF_USE_DYNAMIC_ANNOTATIONS=1 may be defined in build/common.gypi 39 # WTF_USE_DYNAMIC_ANNOTATIONS=1 may be defined in build/common.gypi
40 # We can't define it here because it should be present only 40 # We can't define it here because it should be present only
41 # in Debug or release_valgrind_build=1 builds. 41 # in Debug or release_valgrind_build=1 builds.
42 ], 42 ],
43 # We have to nest variables inside variables so that they can be overridden 43 # We have to nest variables inside variables so that they can be overridden
44 # through GYP_DEFINES. 44 # through GYP_DEFINES.
45 'variables': { 45 'variables': {
46 # Enables the Oilpan garbage-collection infrastructure. 46 # Enables the Oilpan garbage-collection infrastructure.
47 'enable_oilpan%': 0, 47 'enable_oilpan%': 0
48 'enable_touch_icon_loading%' : 0,
49 }, 48 },
50 'conditions': [ 49 'conditions': [
51 ['use_concatenated_impulse_responses==1', { 50 ['use_concatenated_impulse_responses==1', {
52 # Use concatenated HRTF impulse responses 51 # Use concatenated HRTF impulse responses
53 'feature_defines': ['WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1'], 52 'feature_defines': ['WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1'],
54 }], 53 }],
55 ['OS=="android"', { 54 ['OS=="android"', {
56 'feature_defines': [ 55 'feature_defines': [
57 'ENABLE_FAST_MOBILE_SCROLLING=1', 56 'ENABLE_FAST_MOBILE_SCROLLING=1',
58 'ENABLE_INPUT_SPEECH=0', 57 'ENABLE_INPUT_SPEECH=0',
59 'ENABLE_LEGACY_NOTIFICATIONS=0', 58 'ENABLE_LEGACY_NOTIFICATIONS=0',
60 'ENABLE_MEDIA_CAPTURE=1', 59 'ENABLE_MEDIA_CAPTURE=1'
61 'ENABLE_TOUCH_ICON_LOADING=1',
62 ], 60 ],
63 }, { # OS!="android" 61 }, { # OS!="android"
64 'feature_defines': [ 62 'feature_defines': [
65 'ENABLE_INPUT_SPEECH=1', 63 'ENABLE_INPUT_SPEECH=1',
66 'ENABLE_INPUT_MULTIPLE_FIELDS_UI=1', 64 'ENABLE_INPUT_MULTIPLE_FIELDS_UI=1',
67 'ENABLE_LEGACY_NOTIFICATIONS=1', 65 'ENABLE_LEGACY_NOTIFICATIONS=1',
68 'ENABLE_MEDIA_CAPTURE=0', 66 'ENABLE_MEDIA_CAPTURE=0',
69 'ENABLE_WEB_AUDIO=1', 67 'ENABLE_WEB_AUDIO=1'
70 ], 68 ],
71 }], 69 }],
72 # Mac OS X uses Accelerate.framework FFT by default instead of FFmpeg. 70 # Mac OS X uses Accelerate.framework FFT by default instead of FFmpeg.
73 ['OS!="mac" and OS!="android"', { 71 ['OS!="mac" and OS!="android"', {
74 'feature_defines': [ 72 'feature_defines': [
75 'WTF_USE_WEBAUDIO_FFMPEG=1', 73 'WTF_USE_WEBAUDIO_FFMPEG=1',
76 ], 74 ],
77 }], 75 }],
78 ['OS=="android" and use_openmax_dl_fft!=0', { 76 ['OS=="android" and use_openmax_dl_fft!=0', {
79 'feature_defines': [ 77 'feature_defines': [
(...skipping 15 matching lines...) Expand all
95 ], 93 ],
96 }], 94 }],
97 ['enable_oilpan==1', { 95 ['enable_oilpan==1', {
98 'feature_defines': [ 96 'feature_defines': [
99 'ENABLE_OILPAN=1', 97 'ENABLE_OILPAN=1',
100 ], 98 ],
101 }], 99 }],
102 ], 100 ],
103 }, 101 },
104 } 102 }
OLDNEW
« no previous file with comments | « LayoutTests/fast/dom/icon-url-list-apple-touch-expected.txt ('k') | Source/core/dom/Document.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698