OLD | NEW |
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 import("//build/config/features.gni") | 5 import("//build/config/features.gni") |
6 import("//build/config/ui.gni") | 6 import("//build/config/ui.gni") |
7 import("//testing/test.gni") | 7 import("//testing/test.gni") |
8 if (current_cpu == "arm") { | 8 if (current_cpu == "arm") { |
9 import("//build/config/arm.gni") | 9 import("//build/config/arm.gni") |
10 } | 10 } |
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
248 | 248 |
249 cflags = [ | 249 cflags = [ |
250 "/wd4244", # conversion from 'type1( __int64)' to 'type2 (unsigned int)' | 250 "/wd4244", # conversion from 'type1( __int64)' to 'type2 (unsigned int)' |
251 "/wd4267", # conversion from 'size_t' (64 bit) to 'type'(32 bit). | 251 "/wd4267", # conversion from 'size_t' (64 bit) to 'type'(32 bit). |
252 "/wd4341", # signed value is out of range for enum constant. | 252 "/wd4341", # signed value is out of range for enum constant. |
253 "/wd4345", # Object is default-initialized if initialization is omitted. | 253 "/wd4345", # Object is default-initialized if initialization is omitted. |
254 "/wd4390", # ';'empty statement found in looping;is it what was intended? | 254 "/wd4390", # ';'empty statement found in looping;is it what was intended? |
255 "/wd4554", # 'operator' : check operator precedence for possible error | 255 "/wd4554", # 'operator' : check operator precedence for possible error |
256 "/wd4748", # compiler will disable optimizations if a function has inline | 256 "/wd4748", # compiler will disable optimizations if a function has inline |
257 # assembly code contains flow control(jmp or jcc) statements. | 257 # assembly code contains flow control(jmp or jcc) statements. |
| 258 |
258 "/wd4800", # forcing value to bool 'true/false'(assigning int to bool). | 259 "/wd4800", # forcing value to bool 'true/false'(assigning int to bool). |
259 ] | 260 ] |
260 } | 261 } |
261 } | 262 } |
262 | 263 |
263 component("skia") { | 264 component("skia") { |
264 sources = [ | 265 sources = [ |
265 # Chrome sources. | 266 # Chrome sources. |
266 "config/SkUserConfig.h", | 267 "config/SkUserConfig.h", |
| 268 "ext/SkDiscardableMemory_chrome.cc", |
| 269 "ext/SkDiscardableMemory_chrome.h", |
| 270 "ext/SkMemory_new_handler.cpp", |
267 "ext/analysis_canvas.cc", | 271 "ext/analysis_canvas.cc", |
268 "ext/analysis_canvas.h", | 272 "ext/analysis_canvas.h", |
269 "ext/benchmarking_canvas.cc", | 273 "ext/benchmarking_canvas.cc", |
270 "ext/benchmarking_canvas.h", | 274 "ext/benchmarking_canvas.h", |
271 "ext/bitmap_platform_device.h", | 275 "ext/bitmap_platform_device.h", |
272 "ext/convolver.cc", | 276 "ext/convolver.cc", |
273 "ext/convolver.h", | 277 "ext/convolver.h", |
274 "ext/event_tracer_impl.cc", | 278 "ext/event_tracer_impl.cc", |
275 "ext/event_tracer_impl.h", | 279 "ext/event_tracer_impl.h", |
276 "ext/fontmgr_default_win.cc", | 280 "ext/fontmgr_default_win.cc", |
277 "ext/fontmgr_default_win.h", | 281 "ext/fontmgr_default_win.h", |
278 "ext/google_logging.cc", | 282 "ext/google_logging.cc", |
279 "ext/image_operations.cc", | 283 "ext/image_operations.cc", |
280 "ext/image_operations.h", | 284 "ext/image_operations.h", |
281 "ext/opacity_draw_filter.cc", | 285 "ext/opacity_draw_filter.cc", |
282 "ext/opacity_draw_filter.h", | 286 "ext/opacity_draw_filter.h", |
283 "ext/pixel_ref_utils.cc", | 287 "ext/pixel_ref_utils.cc", |
284 "ext/pixel_ref_utils.h", | 288 "ext/pixel_ref_utils.h", |
285 "ext/platform_canvas.cc", | 289 "ext/platform_canvas.cc", |
286 "ext/platform_canvas.h", | 290 "ext/platform_canvas.h", |
287 "ext/platform_device.cc", | 291 "ext/platform_device.cc", |
288 "ext/platform_device.h", | 292 "ext/platform_device.h", |
289 "ext/platform_device_linux.cc", | 293 "ext/platform_device_linux.cc", |
290 "ext/platform_device_mac.cc", | 294 "ext/platform_device_mac.cc", |
291 "ext/platform_device_win.cc", | 295 "ext/platform_device_win.cc", |
292 "ext/recursive_gaussian_convolution.cc", | 296 "ext/recursive_gaussian_convolution.cc", |
293 "ext/recursive_gaussian_convolution.h", | 297 "ext/recursive_gaussian_convolution.h", |
294 "ext/refptr.h", | 298 "ext/refptr.h", |
295 "ext/SkDiscardableMemory_chrome.h", | |
296 "ext/SkDiscardableMemory_chrome.cc", | |
297 "ext/SkMemory_new_handler.cpp", | |
298 "ext/skia_utils_base.cc", | 299 "ext/skia_utils_base.cc", |
299 "ext/skia_utils_base.h", | 300 "ext/skia_utils_base.h", |
| 301 "ext/skia_utils_ios.h", |
300 "ext/skia_utils_ios.mm", | 302 "ext/skia_utils_ios.mm", |
301 "ext/skia_utils_ios.h", | 303 "ext/skia_utils_mac.h", |
302 "ext/skia_utils_mac.mm", | 304 "ext/skia_utils_mac.mm", |
303 "ext/skia_utils_mac.h", | |
304 "ext/skia_utils_win.cc", | 305 "ext/skia_utils_win.cc", |
305 "ext/skia_utils_win.h", | 306 "ext/skia_utils_win.h", |
306 ] | 307 ] |
307 | 308 |
308 # The skia gypi values are relative to the skia_dir, so we need to rebase. | 309 # The skia gypi values are relative to the skia_dir, so we need to rebase. |
309 sources += gypi_skia_core.sources | 310 sources += gypi_skia_core.sources |
310 sources += gypi_skia_effects.sources | 311 sources += gypi_skia_effects.sources |
311 sources += gypi_skia_utils.sources | 312 sources += gypi_skia_utils.sources |
312 sources += gypi_values.skia_library_sources | 313 sources += gypi_values.skia_library_sources |
313 | 314 |
314 # This and skia_opts are really the same conceptual target so share headers. | 315 # This and skia_opts are really the same conceptual target so share headers. |
315 allow_circular_includes_from = [ ":skia_opts" ] | 316 allow_circular_includes_from = [ ":skia_opts" ] |
316 | 317 |
317 if (current_cpu == "arm") { | 318 if (current_cpu == "arm") { |
318 sources += [ | 319 sources += [ |
319 "//third_party/skia/src/core/SkUtilsArm.cpp", | 320 "//third_party/skia/src/core/SkUtilsArm.cpp", |
320 "//third_party/skia/src/core/SkUtilsArm.h", | 321 "//third_party/skia/src/core/SkUtilsArm.h", |
321 ] | 322 ] |
322 } | 323 } |
323 | 324 |
324 # GPU | 325 # GPU |
325 if (skia_support_gpu) { | 326 if (skia_support_gpu) { |
326 sources += gypi_skia_gpu.skgpu_sources | 327 sources += gypi_skia_gpu.skgpu_sources |
327 sources += gypi_skia_gpu.skgpu_null_gl_sources | 328 sources += gypi_skia_gpu.skgpu_null_gl_sources |
328 } | 329 } |
329 | 330 |
330 # Remove unused util files include in utils.gypi | 331 # Remove unused util files include in utils.gypi |
331 sources -= [ | 332 sources -= [ |
332 "//third_party/skia/include/utils/SkBoundaryPatch.h", | 333 "//third_party/skia/include/utils/SkBoundaryPatch.h", |
333 "//third_party/skia/include/utils/SkFrontBufferedStream.h", | |
334 "//third_party/skia/include/utils/SkCamera.h", | 334 "//third_party/skia/include/utils/SkCamera.h", |
335 "//third_party/skia/include/utils/SkCanvasStateUtils.h", | 335 "//third_party/skia/include/utils/SkCanvasStateUtils.h", |
336 "//third_party/skia/include/utils/SkCubicInterval.h", | 336 "//third_party/skia/include/utils/SkCubicInterval.h", |
337 "//third_party/skia/include/utils/SkCullPoints.h", | 337 "//third_party/skia/include/utils/SkCullPoints.h", |
338 "//third_party/skia/include/utils/SkDebugUtils.h", | 338 "//third_party/skia/include/utils/SkDebugUtils.h", |
339 "//third_party/skia/include/utils/SkDumpCanvas.h", | 339 "//third_party/skia/include/utils/SkDumpCanvas.h", |
340 "//third_party/skia/include/utils/SkEventTracer.h", | 340 "//third_party/skia/include/utils/SkEventTracer.h", |
| 341 "//third_party/skia/include/utils/SkFrontBufferedStream.h", |
341 "//third_party/skia/include/utils/SkInterpolator.h", | 342 "//third_party/skia/include/utils/SkInterpolator.h", |
342 "//third_party/skia/include/utils/SkLayer.h", | 343 "//third_party/skia/include/utils/SkLayer.h", |
343 "//third_party/skia/include/utils/SkMeshUtils.h", | 344 "//third_party/skia/include/utils/SkMeshUtils.h", |
344 "//third_party/skia/include/utils/SkNinePatch.h", | 345 "//third_party/skia/include/utils/SkNinePatch.h", |
345 "//third_party/skia/include/utils/SkParse.h", | 346 "//third_party/skia/include/utils/SkParse.h", |
346 "//third_party/skia/include/utils/SkParsePaint.h", | 347 "//third_party/skia/include/utils/SkParsePaint.h", |
347 "//third_party/skia/include/utils/SkParsePath.h", | 348 "//third_party/skia/include/utils/SkParsePath.h", |
348 "//third_party/skia/include/utils/SkRandom.h", | 349 "//third_party/skia/include/utils/SkRandom.h", |
349 "//third_party/skia/src/utils/SkBitmapHasher.cpp", | 350 "//third_party/skia/src/utils/SkBitmapHasher.cpp", |
350 "//third_party/skia/src/utils/SkBitmapHasher.h", | 351 "//third_party/skia/src/utils/SkBitmapHasher.h", |
351 "//third_party/skia/src/utils/SkBoundaryPatch.cpp", | 352 "//third_party/skia/src/utils/SkBoundaryPatch.cpp", |
352 "//third_party/skia/src/utils/SkFrontBufferedStream.cpp", | |
353 "//third_party/skia/src/utils/SkCamera.cpp", | 353 "//third_party/skia/src/utils/SkCamera.cpp", |
354 "//third_party/skia/src/utils/SkCanvasStack.h", | 354 "//third_party/skia/src/utils/SkCanvasStack.h", |
355 "//third_party/skia/src/utils/SkCubicInterval.cpp", | 355 "//third_party/skia/src/utils/SkCubicInterval.cpp", |
356 "//third_party/skia/src/utils/SkCullPoints.cpp", | 356 "//third_party/skia/src/utils/SkCullPoints.cpp", |
357 "//third_party/skia/src/utils/SkDumpCanvas.cpp", | 357 "//third_party/skia/src/utils/SkDumpCanvas.cpp", |
358 "//third_party/skia/src/utils/SkFloatUtils.h", | 358 "//third_party/skia/src/utils/SkFloatUtils.h", |
| 359 "//third_party/skia/src/utils/SkFrontBufferedStream.cpp", |
359 "//third_party/skia/src/utils/SkInterpolator.cpp", | 360 "//third_party/skia/src/utils/SkInterpolator.cpp", |
360 "//third_party/skia/src/utils/SkLayer.cpp", | 361 "//third_party/skia/src/utils/SkLayer.cpp", |
361 "//third_party/skia/src/utils/SkMD5.cpp", | 362 "//third_party/skia/src/utils/SkMD5.cpp", |
362 "//third_party/skia/src/utils/SkMD5.h", | 363 "//third_party/skia/src/utils/SkMD5.h", |
363 "//third_party/skia/src/utils/SkMeshUtils.cpp", | 364 "//third_party/skia/src/utils/SkMeshUtils.cpp", |
364 "//third_party/skia/src/utils/SkNinePatch.cpp", | 365 "//third_party/skia/src/utils/SkNinePatch.cpp", |
365 "//third_party/skia/src/utils/SkOSFile.cpp", | 366 "//third_party/skia/src/utils/SkOSFile.cpp", |
366 "//third_party/skia/src/utils/SkParse.cpp", | 367 "//third_party/skia/src/utils/SkParse.cpp", |
367 "//third_party/skia/src/utils/SkParseColor.cpp", | 368 "//third_party/skia/src/utils/SkParseColor.cpp", |
368 "//third_party/skia/src/utils/SkParsePath.cpp", | 369 "//third_party/skia/src/utils/SkParsePath.cpp", |
369 "//third_party/skia/src/utils/SkPathUtils.cpp", | 370 "//third_party/skia/src/utils/SkPathUtils.cpp", |
370 "//third_party/skia/src/utils/SkSHA1.cpp", | 371 "//third_party/skia/src/utils/SkSHA1.cpp", |
371 "//third_party/skia/src/utils/SkSHA1.h", | 372 "//third_party/skia/src/utils/SkSHA1.h", |
372 "//third_party/skia/src/utils/SkTFitsIn.h", | 373 "//third_party/skia/src/utils/SkTFitsIn.h", |
373 "//third_party/skia/src/utils/SkTLogic.h", | 374 "//third_party/skia/src/utils/SkTLogic.h", |
374 | 375 |
375 # We don't currently need to change thread affinity, so leave out this compl
exity for now. | 376 # We don't currently need to change thread affinity, so leave out this compl
exity for now. |
| 377 "//third_party/skia/src/utils/SkThreadUtils_pthread_linux.cpp", |
376 "//third_party/skia/src/utils/SkThreadUtils_pthread_mach.cpp", | 378 "//third_party/skia/src/utils/SkThreadUtils_pthread_mach.cpp", |
377 "//third_party/skia/src/utils/SkThreadUtils_pthread_linux.cpp", | |
378 | 379 |
379 #testing | 380 #testing |
380 "//third_party/skia/src/fonts/SkGScalerContext.cpp", | 381 "//third_party/skia/src/fonts/SkGScalerContext.cpp", |
381 "//third_party/skia/src/fonts/SkGScalerContext.h", | 382 "//third_party/skia/src/fonts/SkGScalerContext.h", |
382 ] | 383 ] |
383 | 384 |
384 if (is_win) { | 385 if (is_win) { |
385 sources -= [ | 386 sources -= [ |
386 # Keeping _win.cpp | 387 # Keeping _win.cpp |
387 "//third_party/skia/src/utils/SkThreadUtils_pthread.cpp", | 388 "//third_party/skia/src/utils/SkThreadUtils_pthread.cpp", |
(...skipping 22 matching lines...) Expand all Loading... |
410 } | 411 } |
411 | 412 |
412 if (is_android && (!enable_basic_printing && !enable_print_preview)) { | 413 if (is_android && (!enable_basic_printing && !enable_print_preview)) { |
413 sources -= [ "ext/skia_utils_base.cc" ] | 414 sources -= [ "ext/skia_utils_base.cc" ] |
414 } | 415 } |
415 | 416 |
416 # Fixup skia library sources. | 417 # Fixup skia library sources. |
417 if (is_win) { | 418 if (is_win) { |
418 sources -= [ | 419 sources -= [ |
419 "//third_party/skia/src/ports/SkOSFile_posix.cpp", | 420 "//third_party/skia/src/ports/SkOSFile_posix.cpp", |
| 421 "//third_party/skia/src/ports/SkTLS_pthread.cpp", |
420 "//third_party/skia/src/ports/SkTime_Unix.cpp", | 422 "//third_party/skia/src/ports/SkTime_Unix.cpp", |
421 "//third_party/skia/src/ports/SkTLS_pthread.cpp", | |
422 ] | 423 ] |
423 } else { | 424 } else { |
424 sources -= [ | 425 sources -= [ |
425 "//third_party/skia/src/ports/SkFontHost_win.cpp", | 426 "//third_party/skia/src/ports/SkFontHost_win.cpp", |
426 "//third_party/skia/src/ports/SkFontMgr_win_dw.cpp", | 427 "//third_party/skia/src/ports/SkFontMgr_win_dw.cpp", |
427 "//third_party/skia/src/ports/SkOSFile_win.cpp", | 428 "//third_party/skia/src/ports/SkOSFile_win.cpp", |
428 "//third_party/skia/src/ports/SkRemotableFontMgr_win_dw.cpp", | 429 "//third_party/skia/src/ports/SkRemotableFontMgr_win_dw.cpp", |
429 "//third_party/skia/src/ports/SkScalerContext_win_dw.cpp", | 430 "//third_party/skia/src/ports/SkScalerContext_win_dw.cpp", |
430 "//third_party/skia/src/ports/SkScalerContext_win_dw.h", | 431 "//third_party/skia/src/ports/SkScalerContext_win_dw.h", |
431 "//third_party/skia/src/ports/SkTLS_win.cpp", | 432 "//third_party/skia/src/ports/SkTLS_win.cpp", |
432 "//third_party/skia/src/ports/SkTypeface_win_dw.cpp", | 433 "//third_party/skia/src/ports/SkTypeface_win_dw.cpp", |
433 "//third_party/skia/src/ports/SkTypeface_win_dw.h", | 434 "//third_party/skia/src/ports/SkTypeface_win_dw.h", |
434 ] | 435 ] |
435 } | 436 } |
436 if (!is_android) { | 437 if (!is_android) { |
437 sources -= [ | 438 sources -= [ |
438 "//third_party/skia/src/ports/SkFontConfigParser_android.cpp", | 439 "//third_party/skia/src/ports/SkFontConfigParser_android.cpp", |
439 "//third_party/skia/src/ports/SkFontMgr_android.cpp", | 440 "//third_party/skia/src/ports/SkFontMgr_android.cpp", |
440 ] | 441 ] |
441 } | 442 } |
442 if (!is_mac) { | 443 if (!is_mac) { |
443 sources -= [ "//third_party/skia/src/ports/SkFontHost_mac.cpp" ] | 444 sources -= [ "//third_party/skia/src/ports/SkFontHost_mac.cpp" ] |
444 } | 445 } |
445 | 446 |
446 if (!is_linux) { | 447 if (!is_linux) { |
447 sources -= [ | 448 sources -= [ |
448 "//third_party/skia/src/ports/SkFontHost_fontconfig.cpp", | |
449 "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp", | 449 "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp", |
450 "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp", | 450 "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp", |
| 451 "//third_party/skia/src/ports/SkFontHost_fontconfig.cpp", |
451 ] | 452 ] |
452 } | 453 } |
453 | 454 |
454 if (!is_linux && !is_android) { | 455 if (!is_linux && !is_android) { |
455 sources -= [ | 456 sources -= [ |
| 457 "//third_party/skia/src/ports/SkFontHost_FreeType.cpp", |
456 "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp", | 458 "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp", |
457 "//third_party/skia/src/ports/SkFontHost_FreeType.cpp", | |
458 ] | 459 ] |
459 } | 460 } |
460 | 461 |
461 # Select the right BitmapPlatformDevice. | 462 # Select the right BitmapPlatformDevice. |
462 if (is_win) { | 463 if (is_win) { |
463 sources += [ | 464 sources += [ |
464 "ext/bitmap_platform_device_win.cc", | 465 "ext/bitmap_platform_device_win.cc", |
465 "ext/bitmap_platform_device_win.h", | 466 "ext/bitmap_platform_device_win.h", |
466 ] | 467 ] |
467 } else if (is_mac) { | 468 } else if (is_mac) { |
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
626 deps = [ | 627 deps = [ |
627 ":skia", | 628 ":skia", |
628 "//base", | 629 "//base", |
629 "//base/test:run_all_unittests", | 630 "//base/test:run_all_unittests", |
630 "//cc:test_support", # TODO: Fix this test to not depend on cc. | 631 "//cc:test_support", # TODO: Fix this test to not depend on cc. |
631 "//testing/gtest", | 632 "//testing/gtest", |
632 "//ui/gfx", | 633 "//ui/gfx", |
633 "//ui/gfx/geometry", | 634 "//ui/gfx/geometry", |
634 ] | 635 ] |
635 } | 636 } |
OLD | NEW |