summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorssid <ssid@chromium.org>2015-10-05 11:31:50 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-05 18:32:52 +0000
commitc9e223be32b06ce8985bbf57fd4e613acfb9ec89 (patch)
treeb867d9e9e129d1e2ccce444c1dc6ab2ccc4c91a5
parent975fc02186d195c3baf6f0380fed06433c636670 (diff)
downloadchromium_src-c9e223be32b06ce8985bbf57fd4e613acfb9ec89.zip
chromium_src-c9e223be32b06ce8985bbf57fd4e613acfb9ec89.tar.gz
chromium_src-c9e223be32b06ce8985bbf57fd4e613acfb9ec89.tar.bz2
Mechanical Rename of SkTraceMemoryDump_Chrome to SkiaTraceMemoryDumpImpl
The objects of classes initialized by skia should be named with _Chrome, so renaming to the chrome style class name. BUG=532810 TBR=reed@google.com,avi@chromium.org Review URL: https://codereview.chromium.org/1390543002 Cr-Commit-Position: refs/heads/master@{#352360}
-rw-r--r--content/child/web_process_memory_dump_impl.cc4
-rw-r--r--content/child/web_process_memory_dump_impl.h4
-rw-r--r--skia/BUILD.gn2
-rw-r--r--skia/ext/skia_memory_dump_provider.cc6
-rw-r--r--skia/ext/skia_trace_memory_dump_impl.cc (renamed from skia/ext/SkTraceMemoryDump_chrome.cc)30
-rw-r--r--skia/ext/skia_trace_memory_dump_impl.h (renamed from skia/ext/SkTraceMemoryDump_chrome.h)10
-rw-r--r--skia/skia_chrome.gypi2
7 files changed, 29 insertions, 29 deletions
diff --git a/content/child/web_process_memory_dump_impl.cc b/content/child/web_process_memory_dump_impl.cc
index ec7c47b..95197da 100644
--- a/content/child/web_process_memory_dump_impl.cc
+++ b/content/child/web_process_memory_dump_impl.cc
@@ -6,7 +6,7 @@
#include "base/trace_event/process_memory_dump.h"
#include "content/child/web_memory_allocator_dump_impl.h"
-#include "skia/ext/SkTraceMemoryDump_chrome.h"
+#include "skia/ext/skia_trace_memory_dump_impl.h"
namespace content {
@@ -144,7 +144,7 @@ void WebProcessMemoryDumpImpl::AddSuballocation(
SkTraceMemoryDump* WebProcessMemoryDumpImpl::CreateDumpAdapterForSkia(
const blink::WebString& dumpNamePrefix) {
- sk_trace_dump_list_.push_back(new skia::SkTraceMemoryDump_Chrome(
+ sk_trace_dump_list_.push_back(new skia::SkiaTraceMemoryDumpImpl(
dumpNamePrefix.utf8(), level_of_detail_, process_memory_dump_));
return sk_trace_dump_list_.back();
}
diff --git a/content/child/web_process_memory_dump_impl.h b/content/child/web_process_memory_dump_impl.h
index 8533242..33f2fd2 100644
--- a/content/child/web_process_memory_dump_impl.h
+++ b/content/child/web_process_memory_dump_impl.h
@@ -21,7 +21,7 @@ class ProcessMemoryDump;
} // namespace trace_event
namespace skia {
-class SkTraceMemoryDump_Chrome;
+class SkiaTraceMemoryDumpImpl;
} // namespace skia
namespace content {
@@ -95,7 +95,7 @@ class CONTENT_EXPORT WebProcessMemoryDumpImpl final
memory_allocator_dumps_;
// Stores SkTraceMemoryDump for the current ProcessMemoryDump.
- ScopedVector<skia::SkTraceMemoryDump_Chrome> sk_trace_dump_list_;
+ ScopedVector<skia::SkiaTraceMemoryDumpImpl> sk_trace_dump_list_;
DISALLOW_COPY_AND_ASSIGN(WebProcessMemoryDumpImpl);
};
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 4fbec30..793d6b6 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -280,7 +280,6 @@ component("skia") {
# Chrome sources.
"ext/SkDiscardableMemory_chrome.cc",
"ext/SkMemory_new_handler.cpp",
- "ext/SkTraceMemoryDump_chrome.cc",
"ext/analysis_canvas.cc",
"ext/benchmarking_canvas.cc",
"ext/convolver.cc",
@@ -295,6 +294,7 @@ component("skia") {
"ext/platform_device_win.cc",
"ext/recursive_gaussian_convolution.cc",
"ext/skia_memory_dump_provider.cc",
+ "ext/skia_trace_memory_dump_impl.cc",
"ext/skia_utils_base.cc",
"ext/skia_utils_ios.mm",
"ext/skia_utils_mac.mm",
diff --git a/skia/ext/skia_memory_dump_provider.cc b/skia/ext/skia_memory_dump_provider.cc
index aaef11f..e076752 100644
--- a/skia/ext/skia_memory_dump_provider.cc
+++ b/skia/ext/skia_memory_dump_provider.cc
@@ -7,7 +7,7 @@
#include "base/trace_event/memory_allocator_dump.h"
#include "base/trace_event/memory_dump_manager.h"
#include "base/trace_event/process_memory_dump.h"
-#include "skia/ext/SkTraceMemoryDump_chrome.h"
+#include "skia/ext/skia_trace_memory_dump_impl.h"
#include "third_party/skia/include/core/SkGraphics.h"
namespace skia {
@@ -26,8 +26,8 @@ SkiaMemoryDumpProvider::~SkiaMemoryDumpProvider() {}
bool SkiaMemoryDumpProvider::OnMemoryDump(
const base::trace_event::MemoryDumpArgs& args,
base::trace_event::ProcessMemoryDump* process_memory_dump) {
- SkTraceMemoryDump_Chrome skia_dumper(args.level_of_detail,
- process_memory_dump);
+ SkiaTraceMemoryDumpImpl skia_dumper(args.level_of_detail,
+ process_memory_dump);
SkGraphics::DumpMemoryStatistics(&skia_dumper);
return true;
diff --git a/skia/ext/SkTraceMemoryDump_chrome.cc b/skia/ext/skia_trace_memory_dump_impl.cc
index c4bda0c..b07e11d 100644
--- a/skia/ext/SkTraceMemoryDump_chrome.cc
+++ b/skia/ext/skia_trace_memory_dump_impl.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "skia/ext/SkTraceMemoryDump_chrome.h"
+#include "skia/ext/skia_trace_memory_dump_impl.h"
#include "base/trace_event/memory_allocator_dump.h"
#include "base/trace_event/memory_dump_manager.h"
@@ -15,12 +15,12 @@ namespace {
const char kMallocBackingType[] = "malloc";
}
-SkTraceMemoryDump_Chrome::SkTraceMemoryDump_Chrome(
+SkiaTraceMemoryDumpImpl::SkiaTraceMemoryDumpImpl(
base::trace_event::MemoryDumpLevelOfDetail level_of_detail,
base::trace_event::ProcessMemoryDump* process_memory_dump)
- : SkTraceMemoryDump_Chrome("", level_of_detail, process_memory_dump) {}
+ : SkiaTraceMemoryDumpImpl("", level_of_detail, process_memory_dump) {}
-SkTraceMemoryDump_Chrome::SkTraceMemoryDump_Chrome(
+SkiaTraceMemoryDumpImpl::SkiaTraceMemoryDumpImpl(
const std::string& dump_name_prefix,
base::trace_event::MemoryDumpLevelOfDetail level_of_detail,
base::trace_event::ProcessMemoryDump* process_memory_dump)
@@ -31,19 +31,19 @@ SkTraceMemoryDump_Chrome::SkTraceMemoryDump_Chrome(
? SkTraceMemoryDump::kLight_LevelOfDetail
: SkTraceMemoryDump::kObjectsBreakdowns_LevelOfDetail) {}
-SkTraceMemoryDump_Chrome::~SkTraceMemoryDump_Chrome() {}
+SkiaTraceMemoryDumpImpl::~SkiaTraceMemoryDumpImpl() {}
-void SkTraceMemoryDump_Chrome::dumpNumericValue(const char* dumpName,
- const char* valueName,
- const char* units,
- uint64_t value) {
+void SkiaTraceMemoryDumpImpl::dumpNumericValue(const char* dumpName,
+ const char* valueName,
+ const char* units,
+ uint64_t value) {
auto dump = GetOrCreateAllocatorDump(dumpName);
dump->AddScalar(valueName, units, value);
}
-void SkTraceMemoryDump_Chrome::setMemoryBacking(const char* dumpName,
- const char* backingType,
- const char* backingObjectId) {
+void SkiaTraceMemoryDumpImpl::setMemoryBacking(const char* dumpName,
+ const char* backingType,
+ const char* backingObjectId) {
if (strcmp(backingType, kMallocBackingType) == 0) {
auto dump = GetOrCreateAllocatorDump(dumpName);
const char* system_allocator_name =
@@ -58,7 +58,7 @@ void SkTraceMemoryDump_Chrome::setMemoryBacking(const char* dumpName,
}
}
-void SkTraceMemoryDump_Chrome::setDiscardableMemoryBacking(
+void SkiaTraceMemoryDumpImpl::setDiscardableMemoryBacking(
const char* dumpName,
const SkDiscardableMemory& discardableMemoryObject) {
std::string name = dump_name_prefix_ + dumpName;
@@ -70,13 +70,13 @@ void SkTraceMemoryDump_Chrome::setDiscardableMemoryBacking(
DCHECK(dump);
}
-SkTraceMemoryDump::LevelOfDetail SkTraceMemoryDump_Chrome::getRequestedDetails()
+SkTraceMemoryDump::LevelOfDetail SkiaTraceMemoryDumpImpl::getRequestedDetails()
const {
return request_level_;
}
base::trace_event::MemoryAllocatorDump*
-SkTraceMemoryDump_Chrome::GetOrCreateAllocatorDump(const char* dumpName) {
+SkiaTraceMemoryDumpImpl::GetOrCreateAllocatorDump(const char* dumpName) {
std::string name = dump_name_prefix_ + dumpName;
auto dump = process_memory_dump_->GetAllocatorDump(name);
if (!dump)
diff --git a/skia/ext/SkTraceMemoryDump_chrome.h b/skia/ext/skia_trace_memory_dump_impl.h
index 42a0e0e..6fbcf60 100644
--- a/skia/ext/SkTraceMemoryDump_chrome.h
+++ b/skia/ext/skia_trace_memory_dump_impl.h
@@ -21,22 +21,22 @@ class ProcessMemoryDump;
namespace skia {
-class SK_API SkTraceMemoryDump_Chrome : public SkTraceMemoryDump {
+class SK_API SkiaTraceMemoryDumpImpl : public SkTraceMemoryDump {
public:
// This should never outlive the OnMemoryDump call since the
// ProcessMemoryDump is valid only in that timeframe. Optional
// |dump_name_prefix| argument specifies the prefix appended to the dump
// name skia provides. By default it is taken as empty string.
- SkTraceMemoryDump_Chrome(
+ SkiaTraceMemoryDumpImpl(
base::trace_event::MemoryDumpLevelOfDetail level_of_detail,
base::trace_event::ProcessMemoryDump* process_memory_dump);
- SkTraceMemoryDump_Chrome(
+ SkiaTraceMemoryDumpImpl(
const std::string& dump_name_prefix,
base::trace_event::MemoryDumpLevelOfDetail level_of_detail,
base::trace_event::ProcessMemoryDump* process_memory_dump);
- ~SkTraceMemoryDump_Chrome() override;
+ ~SkiaTraceMemoryDumpImpl() override;
// SkTraceMemoryDump implementation:
void dumpNumericValue(const char* dumpName,
@@ -68,7 +68,7 @@ class SK_API SkTraceMemoryDump_Chrome : public SkTraceMemoryDump {
// Stores the level of detail for the current dump.
LevelOfDetail request_level_;
- DISALLOW_COPY_AND_ASSIGN(SkTraceMemoryDump_Chrome);
+ DISALLOW_COPY_AND_ASSIGN(SkiaTraceMemoryDumpImpl);
};
} // namespace skia
diff --git a/skia/skia_chrome.gypi b/skia/skia_chrome.gypi
index f8c39a9..4927624 100644
--- a/skia/skia_chrome.gypi
+++ b/skia/skia_chrome.gypi
@@ -47,8 +47,8 @@
'ext/recursive_gaussian_convolution.cc',
'ext/SkDiscardableMemory_chrome.cc',
'ext/SkMemory_new_handler.cpp',
- 'ext/SkTraceMemoryDump_chrome.cc',
'ext/skia_memory_dump_provider.cc',
+ 'ext/skia_trace_memory_dump_impl.cc',
'ext/skia_utils_base.cc',
'ext/skia_utils_ios.mm',
'ext/skia_utils_mac.mm',