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

Unified Diff: cc/resources/tile_priority.h

Issue 421183003: Revert of Add builders for tracing event's structural arguments (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/resources/tile_manager.cc ('k') | cc/resources/tile_priority.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/tile_priority.h
diff --git a/cc/resources/tile_priority.h b/cc/resources/tile_priority.h
index 02aadae9e0a24a1386b74bd1b9145caf1175a211..a0903f12a15e15cd0c49304c1d88b9ee3a6d96c9 100644
--- a/cc/resources/tile_priority.h
+++ b/cc/resources/tile_priority.h
@@ -7,7 +7,6 @@
#include <algorithm>
#include <limits>
-#include <string>
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
@@ -30,14 +29,16 @@
NUM_TREES = 2
// Be sure to update WhichTreeAsValue when adding new fields.
};
-scoped_ptr<base::Value> WhichTreeAsValue(WhichTree tree);
+scoped_ptr<base::Value> WhichTreeAsValue(
+ WhichTree tree);
enum TileResolution {
LOW_RESOLUTION = 0 ,
HIGH_RESOLUTION = 1,
NON_IDEAL_RESOLUTION = 2,
};
-std::string TileResolutionToString(TileResolution resolution);
+scoped_ptr<base::Value> TileResolutionAsValue(
+ TileResolution resolution);
struct CC_EXPORT TilePriority {
enum PriorityBin { NOW, SOON, EVENTUALLY };
@@ -82,7 +83,7 @@
}
}
- void AsValueInto(base::debug::TracedValue* dict) const;
+ scoped_ptr<base::Value> AsValue() const;
bool operator ==(const TilePriority& other) const {
return resolution == other.resolution &&
@@ -107,7 +108,7 @@
float distance_to_visible;
};
-std::string TilePriorityBinToString(TilePriority::PriorityBin bin);
+scoped_ptr<base::Value> TilePriorityBinAsValue(TilePriority::PriorityBin bin);
enum TileMemoryLimitPolicy {
// Nothing.
@@ -127,7 +128,8 @@
// NOTE: Be sure to update TreePriorityAsValue and kBinPolicyMap when adding
// or reordering fields.
};
-std::string TileMemoryLimitPolicyToString(TileMemoryLimitPolicy policy);
+scoped_ptr<base::Value> TileMemoryLimitPolicyAsValue(
+ TileMemoryLimitPolicy policy);
enum TreePriority {
SAME_PRIORITY_FOR_BOTH_TREES,
@@ -136,7 +138,7 @@
NUM_TREE_PRIORITIES
// Be sure to update TreePriorityAsValue when adding new fields.
};
-std::string TreePriorityToString(TreePriority prio);
+scoped_ptr<base::Value> TreePriorityAsValue(TreePriority prio);
class GlobalStateThatImpactsTilePriority {
public:
@@ -166,7 +168,7 @@
return !(*this == other);
}
- void AsValueInto(base::debug::TracedValue* dict) const;
+ scoped_ptr<base::Value> AsValue() const;
};
} // namespace cc
« no previous file with comments | « cc/resources/tile_manager.cc ('k') | cc/resources/tile_priority.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698