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

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

Issue 18478003: Vibration cannot be canceled during pattern vibration. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Patch for Relanding 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
« 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',
82 '<(DEPTH)/base/base.gyp:test_support_base', 83 '<(DEPTH)/base/base.gyp:test_support_base',
83 '<(DEPTH)/testing/gmock.gyp:gmock', 84 '<(DEPTH)/testing/gmock.gyp:gmock',
84 '<(DEPTH)/testing/gtest.gyp:gtest', 85 '<(DEPTH)/testing/gtest.gyp:gtest',
85 '<(DEPTH)/third_party/icu/icu.gyp:*', 86 '<(DEPTH)/third_party/icu/icu.gyp:*',
86 '<(libjpeg_gyp_path):libjpeg', 87 '<(libjpeg_gyp_path):libjpeg',
87 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng', 88 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
88 '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp', 89 '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp',
89 '<(DEPTH)/third_party/libxml/libxml.gyp:libxml', 90 '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
90 '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt', 91 '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt',
91 '<(DEPTH)/third_party/modp_b64/modp_b64.gyp:modp_b64', 92 '<(DEPTH)/third_party/modp_b64/modp_b64.gyp:modp_b64',
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 }, 244 },
244 { 245 {
245 'target_name': 'webkit_test_support', 246 'target_name': 'webkit_test_support',
246 'conditions': [ 247 'conditions': [
247 ['component=="shared_library"', { 248 ['component=="shared_library"', {
248 'type': 'none', 249 'type': 'none',
249 }, { 250 }, {
250 'type': 'static_library', 251 'type': 'static_library',
251 'dependencies': [ 252 'dependencies': [
252 '../core/core.gyp:webcore_test_support', 253 '../core/core.gyp:webcore_test_support',
254 '../modules/modules.gyp:modules_test_support',
253 '../wtf/wtf.gyp:wtf', 255 '../wtf/wtf.gyp:wtf',
254 '<(DEPTH)/skia/skia.gyp:skia', 256 '<(DEPTH)/skia/skia.gyp:skia',
255 ], 257 ],
256 'include_dirs': [ 258 'include_dirs': [
257 '../../public/web', 259 '../../public/web',
258 '../core/testing/v8', # for WebCoreTestSupport.h, needed to link in window.internals code. 260 '../core/testing/v8', # for WebCoreTestSupport.h, needed to link in window.internals code.
259 '../../', 261 '../../',
260 ], 262 ],
261 'sources': [ 263 'sources': [
262 'WebTestingSupport.cpp', 264 'WebTestingSupport.cpp',
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 ['clang==1', { 377 ['clang==1', {
376 'target_defaults': { 378 'target_defaults': {
377 'cflags': ['-Wglobal-constructors'], 379 'cflags': ['-Wglobal-constructors'],
378 'xcode_settings': { 380 'xcode_settings': {
379 'WARNING_CFLAGS': ['-Wglobal-constructors'], 381 'WARNING_CFLAGS': ['-Wglobal-constructors'],
380 }, 382 },
381 }, 383 },
382 }], 384 }],
383 ], # conditions 385 ], # conditions
384 } 386 }
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