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

Side by Side Diff: ui/base/resource/resource_bundle.cc

Issue 747443002: Undoing instrumentations for task URLRequestSimpleJob::StartAsync (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removing changes that conflict with another CL Created 6 years, 1 month 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 | « storage/browser/blob/view_blob_internals_job.cc ('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 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/base/resource/resource_bundle.h" 5 #include "ui/base/resource/resource_bundle.h"
6 6
7 #include <limits> 7 #include <limits>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/big_endian.h" 10 #include "base/big_endian.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/files/file.h" 12 #include "base/files/file.h"
13 #include "base/files/file_util.h" 13 #include "base/files/file_util.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/memory/ref_counted_memory.h" 15 #include "base/memory/ref_counted_memory.h"
16 #include "base/metrics/histogram.h" 16 #include "base/metrics/histogram.h"
17 #include "base/path_service.h" 17 #include "base/path_service.h"
18 #include "base/profiler/scoped_tracker.h"
19 #include "base/stl_util.h" 18 #include "base/stl_util.h"
20 #include "base/strings/string_piece.h" 19 #include "base/strings/string_piece.h"
21 #include "base/strings/utf_string_conversions.h" 20 #include "base/strings/utf_string_conversions.h"
22 #include "base/synchronization/lock.h" 21 #include "base/synchronization/lock.h"
23 #include "build/build_config.h" 22 #include "build/build_config.h"
24 #include "skia/ext/image_operations.h" 23 #include "skia/ext/image_operations.h"
25 #include "third_party/skia/include/core/SkBitmap.h" 24 #include "third_party/skia/include/core/SkBitmap.h"
26 #include "ui/base/l10n/l10n_util.h" 25 #include "ui/base/l10n/l10n_util.h"
27 #include "ui/base/layout.h" 26 #include "ui/base/layout.h"
28 #include "ui/base/resource/data_pack.h" 27 #include "ui/base/resource/data_pack.h"
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
447 return bytes; 446 return bytes;
448 } 447 }
449 448
450 base::StringPiece ResourceBundle::GetRawDataResource(int resource_id) const { 449 base::StringPiece ResourceBundle::GetRawDataResource(int resource_id) const {
451 return GetRawDataResourceForScale(resource_id, ui::SCALE_FACTOR_NONE); 450 return GetRawDataResourceForScale(resource_id, ui::SCALE_FACTOR_NONE);
452 } 451 }
453 452
454 base::StringPiece ResourceBundle::GetRawDataResourceForScale( 453 base::StringPiece ResourceBundle::GetRawDataResourceForScale(
455 int resource_id, 454 int resource_id,
456 ScaleFactor scale_factor) const { 455 ScaleFactor scale_factor) const {
457 // TODO(vadimt): Remove ScopedTracker below once crbug.com/422489 is fixed.
458 tracked_objects::ScopedTracker tracking_profile1(
459 FROM_HERE_WITH_EXPLICIT_FUNCTION(
460 "422489 ResourceBundle::GetRawDataResourceForScale 1"));
461
462 base::StringPiece data; 456 base::StringPiece data;
463 if (delegate_ && 457 if (delegate_ &&
464 delegate_->GetRawDataResource(resource_id, scale_factor, &data)) 458 delegate_->GetRawDataResource(resource_id, scale_factor, &data))
465 return data; 459 return data;
466 460
467 // TODO(vadimt): Remove ScopedTracker below once crbug.com/422489 is fixed.
468 tracked_objects::ScopedTracker tracking_profile2(
469 FROM_HERE_WITH_EXPLICIT_FUNCTION(
470 "422489 ResourceBundle::GetRawDataResourceForScale 2"));
471
472 if (scale_factor != ui::SCALE_FACTOR_100P) { 461 if (scale_factor != ui::SCALE_FACTOR_100P) {
473 for (size_t i = 0; i < data_packs_.size(); i++) { 462 for (size_t i = 0; i < data_packs_.size(); i++) {
474 if (data_packs_[i]->GetScaleFactor() == scale_factor && 463 if (data_packs_[i]->GetScaleFactor() == scale_factor &&
475 data_packs_[i]->GetStringPiece(static_cast<uint16>(resource_id), 464 data_packs_[i]->GetStringPiece(static_cast<uint16>(resource_id),
476 &data)) 465 &data))
477 return data; 466 return data;
478 } 467 }
479 } 468 }
480 // TODO(vadimt): Remove ScopedTracker below once crbug.com/422489 is fixed.
481 tracked_objects::ScopedTracker tracking_profile3(
482 FROM_HERE_WITH_EXPLICIT_FUNCTION(
483 "422489 ResourceBundle::GetRawDataResourceForScale 3"));
484 469
485 for (size_t i = 0; i < data_packs_.size(); i++) { 470 for (size_t i = 0; i < data_packs_.size(); i++) {
486 if ((data_packs_[i]->GetScaleFactor() == ui::SCALE_FACTOR_100P || 471 if ((data_packs_[i]->GetScaleFactor() == ui::SCALE_FACTOR_100P ||
487 data_packs_[i]->GetScaleFactor() == ui::SCALE_FACTOR_200P || 472 data_packs_[i]->GetScaleFactor() == ui::SCALE_FACTOR_200P ||
488 data_packs_[i]->GetScaleFactor() == ui::SCALE_FACTOR_300P || 473 data_packs_[i]->GetScaleFactor() == ui::SCALE_FACTOR_300P ||
489 data_packs_[i]->GetScaleFactor() == ui::SCALE_FACTOR_NONE) && 474 data_packs_[i]->GetScaleFactor() == ui::SCALE_FACTOR_NONE) &&
490 data_packs_[i]->GetStringPiece(static_cast<uint16>(resource_id), 475 data_packs_[i]->GetStringPiece(static_cast<uint16>(resource_id),
491 &data)) 476 &data))
492 return data; 477 return data;
493 } 478 }
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
870 // static 855 // static
871 bool ResourceBundle::DecodePNG(const unsigned char* buf, 856 bool ResourceBundle::DecodePNG(const unsigned char* buf,
872 size_t size, 857 size_t size,
873 SkBitmap* bitmap, 858 SkBitmap* bitmap,
874 bool* fell_back_to_1x) { 859 bool* fell_back_to_1x) {
875 *fell_back_to_1x = PNGContainsFallbackMarker(buf, size); 860 *fell_back_to_1x = PNGContainsFallbackMarker(buf, size);
876 return gfx::PNGCodec::Decode(buf, size, bitmap); 861 return gfx::PNGCodec::Decode(buf, size, bitmap);
877 } 862 }
878 863
879 } // namespace ui 864 } // namespace ui
OLDNEW
« no previous file with comments | « storage/browser/blob/view_blob_internals_job.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698