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

Side by Side Diff: ui/gfx/test/icc_profiles.cc

Issue 2663153002: Fix id tracking bug in ICCProfile (Closed)
Patch Set: Created 3 years, 10 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 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #include "ui/gfx/test/icc_profiles.h" 5 #include "ui/gfx/test/icc_profiles.h"
6 6
7 namespace gfx { 7 namespace gfx {
8 8
9 namespace { 9 namespace {
10 10
(...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after
529 0x02, 0x33, 0x00, 0x00, 0x63, 0x75, 0x72, 0x76, 0x00, 0x00, 0x00, 0x00, 529 0x02, 0x33, 0x00, 0x00, 0x63, 0x75, 0x72, 0x76, 0x00, 0x00, 0x00, 0x00,
530 0x00, 0x00, 0x00, 0x01, 0x02, 0x33, 0x00, 0x00, 0x58, 0x59, 0x5a, 0x20, 530 0x00, 0x00, 0x00, 0x01, 0x02, 0x33, 0x00, 0x00, 0x58, 0x59, 0x5a, 0x20,
531 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x18, 0x00, 0x00, 0x4f, 0xa5, 531 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x18, 0x00, 0x00, 0x4f, 0xa5,
532 0x00, 0x00, 0x04, 0xfc, 0x58, 0x59, 0x5a, 0x20, 0x00, 0x00, 0x00, 0x00, 532 0x00, 0x00, 0x04, 0xfc, 0x58, 0x59, 0x5a, 0x20, 0x00, 0x00, 0x00, 0x00,
533 0x00, 0x00, 0x34, 0x8d, 0x00, 0x00, 0xa0, 0x2c, 0x00, 0x00, 0x0f, 0x95, 533 0x00, 0x00, 0x34, 0x8d, 0x00, 0x00, 0xa0, 0x2c, 0x00, 0x00, 0x0f, 0x95,
534 0x58, 0x59, 0x5a, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x26, 0x31, 534 0x58, 0x59, 0x5a, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x26, 0x31,
535 0x00, 0x00, 0x10, 0x2f, 0x00, 0x00, 0xbe, 0x9c}; 535 0x00, 0x00, 0x10, 0x2f, 0x00, 0x00, 0xbe, 0x9c};
536 } 536 }
537 537
538 ICCProfile ICCProfileForTestingAdobeRGB() { 538 ICCProfile ICCProfileForTestingAdobeRGB() {
539 return ICCProfile::FromData( 539 return ICCProfile::FromDataWithId(
540 reinterpret_cast<const char*>(adobe_rgb_profile_data), 540 reinterpret_cast<const char*>(adobe_rgb_profile_data),
541 arraysize(adobe_rgb_profile_data)); 541 arraysize(adobe_rgb_profile_data), ICCProfile::test_id_adobe_rgb_);
542 } 542 }
543 543
544 ICCProfile ICCProfileForTestingGenericRGB() { 544 ICCProfile ICCProfileForTestingGenericRGB() {
545 return ICCProfile::FromData( 545 return ICCProfile::FromDataWithId(
546 reinterpret_cast<const char*>(generic_rgb_profile_data), 546 reinterpret_cast<const char*>(generic_rgb_profile_data),
547 arraysize(generic_rgb_profile_data)); 547 arraysize(generic_rgb_profile_data), ICCProfile::test_id_generic_rgb_);
548 } 548 }
549 549
550 ICCProfile ICCProfileForTestingSRGB() { 550 ICCProfile ICCProfileForTestingSRGB() {
551 return ICCProfile::FromData(reinterpret_cast<const char*>(srgb_profile_data), 551 return ICCProfile::FromDataWithId(
552 arraysize(srgb_profile_data)); 552 reinterpret_cast<const char*>(srgb_profile_data),
553 arraysize(srgb_profile_data), ICCProfile::test_id_srgb_);
553 } 554 }
554 555
555 ICCProfile ICCProfileForTestingColorSpin() { 556 ICCProfile ICCProfileForTestingColorSpin() {
556 return ICCProfile::FromData( 557 return ICCProfile::FromDataWithId(
557 reinterpret_cast<const char*>(colorspin_profile_data), 558 reinterpret_cast<const char*>(colorspin_profile_data),
558 arraysize(colorspin_profile_data)); 559 arraysize(colorspin_profile_data), ICCProfile::test_id_color_spin_);
559 } 560 }
560 561
561 } // namespace gfx 562 } // namespace gfx
OLDNEW
« third_party/WebKit/Source/platform/graphics/ColorBehavior.cpp ('K') | « ui/gfx/icc_profile.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698