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

Unified Diff: content/common/gpu/gpu_command_buffer_stub.cc

Issue 1703163002: Remove dependency on GURL from content/common/gpu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 side-by-side diff with in-line comments
Download patch
Index: content/common/gpu/gpu_command_buffer_stub.cc
diff --git a/content/common/gpu/gpu_command_buffer_stub.cc b/content/common/gpu/gpu_command_buffer_stub.cc
index d0ed3d1c42908ca3b99bd7de42dc60870fad4c93..64a63252bd9da85301503716a403ef2a18181039 100644
--- a/content/common/gpu/gpu_command_buffer_stub.cc
+++ b/content/common/gpu/gpu_command_buffer_stub.cc
@@ -107,12 +107,12 @@ class GpuCommandBufferMemoryTracker : public gpu::gles2::MemoryTracker {
// FastSetActiveURL will shortcut the expensive call to SetActiveURL when the
// url_hash matches.
-void FastSetActiveURL(const GURL& url, size_t url_hash) {
+void FastSetActiveURL(const std::string& url, size_t url_hash) {
// Leave the previously set URL in the empty case -- empty URLs are given by
// BlinkPlatformImpl::createOffscreenGraphicsContext3D. Hopefully the
// onscreen context URL was set previously and will show up even when a crash
// occurs during offscreen command processing.
- if (url.is_empty())
+ if (url.empty())
return;
static size_t g_last_url_hash = 0;
if (url_hash != g_last_url_hash) {
@@ -193,7 +193,7 @@ GpuCommandBufferStub::GpuCommandBufferStub(
int32_t route_id,
bool offscreen,
GpuWatchdog* watchdog,
- const GURL& active_url)
+ const std::string& active_url)
: channel_(channel),
sync_point_manager_(sync_point_manager),
task_runner_(task_runner),
@@ -215,7 +215,7 @@ GpuCommandBufferStub::GpuCommandBufferStub(
previous_processed_num_(0),
preemption_flag_(preempt_by_flag),
active_url_(active_url) {
- active_url_hash_ = base::Hash(active_url.possibly_invalid_spec());
+ active_url_hash_ = base::Hash(active_url);
FastSetActiveURL(active_url_, active_url_hash_);
gpu::gles2::ContextCreationAttribHelper attrib_parser;
@@ -470,7 +470,7 @@ void GpuCommandBufferStub::Destroy() {
if (initialized_) {
GpuChannelManager* gpu_channel_manager = channel_->gpu_channel_manager();
- if (handle_.is_null() && !active_url_.is_empty()) {
+ if (handle_.is_null() && !active_url_.empty()) {
gpu_channel_manager->Send(
new GpuHostMsg_DidDestroyOffscreenContext(active_url_));
}
@@ -673,7 +673,7 @@ void GpuCommandBufferStub::OnInitialize(
reply_message, true, capabilities);
Send(reply_message);
- if (handle_.is_null() && !active_url_.is_empty()) {
+ if (handle_.is_null() && !active_url_.empty()) {
manager->Send(new GpuHostMsg_DidCreateOffscreenContext(
active_url_));
}

Powered by Google App Engine
This is Rietveld 408576698