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

Side by Side Diff: Source/web/web.gyp

Issue 30063003: Revert r160289 "Vibration cannot be canceled during pattern vibration." (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « Source/modules/vibration/testing/InternalsVibration.idl ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # 1 #
2 # Copyright (C) 2011 Google Inc. All rights reserved. 2 # Copyright (C) 2011 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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 ], 72 ],
73 'sources': [ 73 'sources': [
74 '<@(webcore_platform_support_files)', 74 '<@(webcore_platform_support_files)',
75 '<@(web_files)', 75 '<@(web_files)',
76 ], 76 ],
77 'conditions': [ 77 'conditions': [
78 ['component=="shared_library"', { 78 ['component=="shared_library"', {
79 'dependencies': [ 79 'dependencies': [
80 '../core/core.gyp:webcore_derived', 80 '../core/core.gyp:webcore_derived',
81 '../core/core.gyp:webcore_test_support', 81 '../core/core.gyp:webcore_test_support',
82 '../modules/modules.gyp:modules_test_support',
83 '<(DEPTH)/base/base.gyp:test_support_base', 82 '<(DEPTH)/base/base.gyp:test_support_base',
84 '<(DEPTH)/testing/gmock.gyp:gmock', 83 '<(DEPTH)/testing/gmock.gyp:gmock',
85 '<(DEPTH)/testing/gtest.gyp:gtest', 84 '<(DEPTH)/testing/gtest.gyp:gtest',
86 '<(DEPTH)/third_party/icu/icu.gyp:*', 85 '<(DEPTH)/third_party/icu/icu.gyp:*',
87 '<(libjpeg_gyp_path):libjpeg', 86 '<(libjpeg_gyp_path):libjpeg',
88 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng', 87 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
89 '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp', 88 '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp',
90 '<(DEPTH)/third_party/libxml/libxml.gyp:libxml', 89 '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
91 '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt', 90 '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt',
92 '<(DEPTH)/third_party/modp_b64/modp_b64.gyp:modp_b64', 91 '<(DEPTH)/third_party/modp_b64/modp_b64.gyp:modp_b64',
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 }, 243 },
245 { 244 {
246 'target_name': 'webkit_test_support', 245 'target_name': 'webkit_test_support',
247 'conditions': [ 246 'conditions': [
248 ['component=="shared_library"', { 247 ['component=="shared_library"', {
249 'type': 'none', 248 'type': 'none',
250 }, { 249 }, {
251 'type': 'static_library', 250 'type': 'static_library',
252 'dependencies': [ 251 'dependencies': [
253 '../core/core.gyp:webcore_test_support', 252 '../core/core.gyp:webcore_test_support',
254 '../modules/modules.gyp:modules_test_support',
255 '../wtf/wtf.gyp:wtf', 253 '../wtf/wtf.gyp:wtf',
256 '<(DEPTH)/skia/skia.gyp:skia', 254 '<(DEPTH)/skia/skia.gyp:skia',
257 ], 255 ],
258 'include_dirs': [ 256 'include_dirs': [
259 '../../public/web', 257 '../../public/web',
260 '../core/testing/v8', # for WebCoreTestSupport.h, needed to link in window.internals code. 258 '../core/testing/v8', # for WebCoreTestSupport.h, needed to link in window.internals code.
261 '../../', 259 '../../',
262 ], 260 ],
263 'sources': [ 261 'sources': [
264 'WebTestingSupport.cpp', 262 'WebTestingSupport.cpp',
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 ['clang==1', { 375 ['clang==1', {
378 'target_defaults': { 376 'target_defaults': {
379 'cflags': ['-Wglobal-constructors'], 377 'cflags': ['-Wglobal-constructors'],
380 'xcode_settings': { 378 'xcode_settings': {
381 'WARNING_CFLAGS': ['-Wglobal-constructors'], 379 'WARNING_CFLAGS': ['-Wglobal-constructors'],
382 }, 380 },
383 }, 381 },
384 }], 382 }],
385 ], # conditions 383 ], # conditions
386 } 384 }
OLDNEW
« no previous file with comments | « Source/modules/vibration/testing/InternalsVibration.idl ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698