summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
Diffstat (limited to 'webkit')
-rw-r--r--webkit/appcache/appcache_database.cc4
-rw-r--r--webkit/appcache/appcache_storage_impl.cc4
-rw-r--r--webkit/appcache/appcache_update_job.cc14
-rw-r--r--webkit/glue/media/video_renderer_impl.cc6
-rw-r--r--webkit/glue/plugins/pepper_plugin_instance.cc2
-rw-r--r--webkit/glue/plugins/plugin_host.cc24
-rw-r--r--webkit/glue/websocketstreamhandle_impl.cc14
7 files changed, 33 insertions, 35 deletions
diff --git a/webkit/appcache/appcache_database.cc b/webkit/appcache/appcache_database.cc
index d7210c4..a4fbefe 100644
--- a/webkit/appcache/appcache_database.cc
+++ b/webkit/appcache/appcache_database.cc
@@ -164,7 +164,7 @@ void AppCacheDatabase::CloseConnection() {
}
void AppCacheDatabase::Disable() {
- LOG(INFO) << "Disabling appcache database.";
+ VLOG(1) << "Disabling appcache database.";
is_disabled_ = true;
ResetConnectionAndTables();
}
@@ -1103,7 +1103,7 @@ void AppCacheDatabase::ResetConnectionAndTables() {
bool AppCacheDatabase::DeleteExistingAndCreateNewDatabase() {
DCHECK(!db_file_path_.empty());
DCHECK(file_util::PathExists(db_file_path_));
- LOG(INFO) << "Deleting existing appcache data and starting over.";
+ VLOG(1) << "Deleting existing appcache data and starting over.";
ResetConnectionAndTables();
diff --git a/webkit/appcache/appcache_storage_impl.cc b/webkit/appcache/appcache_storage_impl.cc
index 2231234..518f840 100644
--- a/webkit/appcache/appcache_storage_impl.cc
+++ b/webkit/appcache/appcache_storage_impl.cc
@@ -882,7 +882,7 @@ void AppCacheStorageImpl::Initialize(const FilePath& cache_directory,
void AppCacheStorageImpl::Disable() {
if (is_disabled_)
return;
- LOG(INFO) << "Disabling appcache storage.";
+ VLOG(1) << "Disabling appcache storage.";
is_disabled_ = true;
origins_with_groups_.clear();
working_set()->Disable();
@@ -1318,7 +1318,7 @@ void AppCacheStorageImpl::OnDiskCacheInitialized(int rv) {
// session should start with a clean slate.
Disable();
if (!is_incognito_) {
- LOG(INFO) << "Deleting existing appcache data and starting over.";
+ VLOG(1) << "Deleting existing appcache data and starting over.";
AppCacheThread::PostTask(AppCacheThread::db(), FROM_HERE,
NewRunnableFunction(DeleteDirectory, cache_directory_));
}
diff --git a/webkit/appcache/appcache_update_job.cc b/webkit/appcache/appcache_update_job.cc
index 7d48a3a..3aeb497 100644
--- a/webkit/appcache/appcache_update_job.cc
+++ b/webkit/appcache/appcache_update_job.cc
@@ -591,7 +591,7 @@ void AppCacheUpdateJob::ContinueHandleManifestFetchCompleted(bool changed) {
const std::string message = base::StringPrintf(kFormatString,
manifest_url_.spec().c_str());
HandleCacheFailure(message);
- LOG(INFO) << message;
+ VLOG(1) << message;
return;
}
@@ -646,9 +646,9 @@ void AppCacheUpdateJob::HandleUrlFetchCompleted(URLRequest* request) {
// whose value doesn't match the manifest url of the application cache
// being processed, mark the entry as being foreign.
} else {
- LOG(INFO) << "Request status: " << request->status().status()
- << " os_error: " << request->status().os_error()
- << " response code: " << response_code;
+ VLOG(1) << "Request status: " << request->status().status()
+ << " os_error: " << request->status().os_error()
+ << " response code: " << response_code;
if (entry.IsExplicit() || entry.IsFallback()) {
if (response_code == 304 && info->existing_entry_.has_response_id()) {
// Keep the existing response.
@@ -788,9 +788,9 @@ void AppCacheUpdateJob::HandleManifestRefetchCompleted(URLRequest* request) {
&manifest_info_write_callback_);
}
} else {
- LOG(INFO) << "Request status: " << request->status().status()
- << " os_error: " << request->status().os_error()
- << " response code: " << response_code;
+ VLOG(1) << "Request status: " << request->status().status()
+ << " os_error: " << request->status().os_error()
+ << " response code: " << response_code;
ScheduleUpdateRetry(kRerunDelayMs);
HandleCacheFailure("Manifest changed during update, scheduling retry");
}
diff --git a/webkit/glue/media/video_renderer_impl.cc b/webkit/glue/media/video_renderer_impl.cc
index bc3779d..16c9ef6 100644
--- a/webkit/glue/media/video_renderer_impl.cc
+++ b/webkit/glue/media/video_renderer_impl.cc
@@ -88,10 +88,8 @@ void VideoRendererImpl::Paint(skia::PlatformCanvas* canvas,
// on low-end devices. When profiled on an Intel Atom N280 @ 1.66GHz this
// code had a ~63 microsecond perf hit when logging to a file (not stdout),
// which is neglible enough for measuring playback performance.
- if (pts_logging_) {
- LOG(INFO) << "pts="
- << video_frame->GetTimestamp().InMicroseconds();
- }
+ if (pts_logging_)
+ VLOG(1) << "pts=" << video_frame->GetTimestamp().InMicroseconds();
}
PutCurrentFrame(video_frame);
diff --git a/webkit/glue/plugins/pepper_plugin_instance.cc b/webkit/glue/plugins/pepper_plugin_instance.cc
index 8438da6..54a1f42 100644
--- a/webkit/glue/plugins/pepper_plugin_instance.cc
+++ b/webkit/glue/plugins/pepper_plugin_instance.cc
@@ -813,7 +813,7 @@ bool PluginInstance::SetFullscreen(bool fullscreen) {
bool is_fullscreen = (fullscreen_container_ != NULL);
if (fullscreen == is_fullscreen)
return true;
- LOG(INFO) << "Setting fullscreen to " << (fullscreen ? "on" : "off");
+ VLOG(1) << "Setting fullscreen to " << (fullscreen ? "on" : "off");
if (fullscreen) {
fullscreen_container_ = delegate_->CreateFullscreenContainer(this);
} else {
diff --git a/webkit/glue/plugins/plugin_host.cc b/webkit/glue/plugins/plugin_host.cc
index b0fe8fa..add6c03 100644
--- a/webkit/glue/plugins/plugin_host.cc
+++ b/webkit/glue/plugins/plugin_host.cc
@@ -310,7 +310,7 @@ uint32_t NPN_MemFlush(uint32_t size) {
// Should force a re-scan of the plugins directory to load new ones.
void NPN_ReloadPlugins(NPBool reloadPages) {
// TODO: implement me
- DLOG(INFO) << "NPN_ReloadPlugin is not implemented yet.";
+ DVLOG(1) << "NPN_ReloadPlugin is not implemented yet.";
}
// Requests a range of bytes for a seekable stream.
@@ -526,7 +526,7 @@ NPError NPN_NewStream(NPP id,
// Browser should put this stream into a window target.
//
// TODO: implement me
- DLOG(INFO) << "NPN_NewStream is not implemented yet.";
+ DVLOG(1) << "NPN_NewStream is not implemented yet.";
return NPERR_GENERIC_ERROR;
}
@@ -534,7 +534,7 @@ int32_t NPN_Write(NPP id, NPStream* stream, int32_t len, void* buffer) {
// Writes data to an existing Plugin-created stream.
// TODO: implement me
- DLOG(INFO) << "NPN_Write is not implemented yet.";
+ DVLOG(1) << "NPN_Write is not implemented yet.";
return NPERR_GENERIC_ERROR;
}
@@ -594,7 +594,7 @@ void NPN_Status(NPP id, const char* message) {
// Displays a message on the status line of the browser window.
// TODO: implement me
- DLOG(INFO) << "NPN_Status is not implemented yet.";
+ DVLOG(1) << "NPN_Status is not implemented yet.";
}
void NPN_InvalidateRect(NPP id, NPRect *invalidRect) {
@@ -829,7 +829,7 @@ NPError NPN_GetValue(NPP id, NPNVariable variable, void* value) {
rv = NPAPI::GetPepperExtensionsFunctions(value);
break;
default:
- DLOG(INFO) << "NPN_GetValue(" << variable << ") is not implemented yet.";
+ DVLOG(1) << "NPN_GetValue(" << variable << ") is not implemented yet.";
break;
}
return rv;
@@ -864,14 +864,14 @@ NPError NPN_SetValue(NPP id, NPPVariable variable, void* value) {
// Specifies whether you are pushing or popping the JSContext off.
// the stack
// TODO: implement me
- DLOG(INFO) <<
- "NPN_SetValue(NPPVJavascriptPushCallerBool) is not implemented.";
+ DVLOG(1) << "NPN_SetValue(NPPVJavascriptPushCallerBool) is not "
+ "implemented.";
return NPERR_GENERIC_ERROR;
case NPPVpluginKeepLibraryInMemory:
// Tells browser that plugin library should live longer than usual.
// TODO: implement me
- DLOG(INFO) <<
- "NPN_SetValue(NPPVpluginKeepLibraryInMemory) is not implemented.";
+ DVLOG(1) << "NPN_SetValue(NPPVpluginKeepLibraryInMemory) is not "
+ "implemented.";
return NPERR_GENERIC_ERROR;
#if defined(OS_MACOSX)
case NPPVpluginDrawingModel: {
@@ -902,7 +902,7 @@ NPError NPN_SetValue(NPP id, NPPVariable variable, void* value) {
#endif
default:
// TODO: implement me
- DLOG(INFO) << "NPN_SetValue(" << variable << ") is not implemented.";
+ DVLOG(1) << "NPN_SetValue(" << variable << ") is not implemented.";
break;
}
@@ -912,13 +912,13 @@ NPError NPN_SetValue(NPP id, NPPVariable variable, void* value) {
void* NPN_GetJavaEnv() {
// TODO: implement me
- DLOG(INFO) << "NPN_GetJavaEnv is not implemented.";
+ DVLOG(1) << "NPN_GetJavaEnv is not implemented.";
return NULL;
}
void* NPN_GetJavaPeer(NPP) {
// TODO: implement me
- DLOG(INFO) << "NPN_GetJavaPeer is not implemented.";
+ DVLOG(1) << "NPN_GetJavaPeer is not implemented.";
return NULL;
}
diff --git a/webkit/glue/websocketstreamhandle_impl.cc b/webkit/glue/websocketstreamhandle_impl.cc
index 60faea2..6a56393 100644
--- a/webkit/glue/websocketstreamhandle_impl.cc
+++ b/webkit/glue/websocketstreamhandle_impl.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -72,7 +72,7 @@ WebSocketStreamHandleImpl::Context::Context(WebSocketStreamHandleImpl* handle)
}
void WebSocketStreamHandleImpl::Context::Connect(const WebKit::WebURL& url) {
- LOG(INFO) << "Connect url=" << url;
+ VLOG(1) << "Connect url=" << url;
DCHECK(!bridge_);
bridge_ = WebSocketStreamHandleBridge::Create(handle_, this);
AddRef(); // Will be released by DidClose().
@@ -80,14 +80,14 @@ void WebSocketStreamHandleImpl::Context::Connect(const WebKit::WebURL& url) {
}
bool WebSocketStreamHandleImpl::Context::Send(const WebKit::WebData& data) {
- LOG(INFO) << "Send data.size=" << data.size();
+ VLOG(1) << "Send data.size=" << data.size();
DCHECK(bridge_);
return bridge_->Send(
std::vector<char>(data.data(), data.data() + data.size()));
}
void WebSocketStreamHandleImpl::Context::Close() {
- LOG(INFO) << "Close";
+ VLOG(1) << "Close";
if (bridge_)
bridge_->Close();
}
@@ -105,7 +105,7 @@ void WebSocketStreamHandleImpl::Context::Detach() {
void WebSocketStreamHandleImpl::Context::DidOpenStream(
WebKit::WebSocketStreamHandle* web_handle, int max_amount_send_allowed) {
- LOG(INFO) << "DidOpen";
+ VLOG(1) << "DidOpen";
if (client_)
client_->didOpenStream(handle_, max_amount_send_allowed);
}
@@ -124,7 +124,7 @@ void WebSocketStreamHandleImpl::Context::DidReceiveData(
void WebSocketStreamHandleImpl::Context::DidClose(
WebKit::WebSocketStreamHandle* web_handle) {
- LOG(INFO) << "DidClose";
+ VLOG(1) << "DidClose";
bridge_ = NULL;
WebSocketStreamHandleImpl* handle = handle_;
handle_ = NULL;
@@ -151,7 +151,7 @@ WebSocketStreamHandleImpl::~WebSocketStreamHandleImpl() {
void WebSocketStreamHandleImpl::connect(
const WebKit::WebURL& url, WebKit::WebSocketStreamHandleClient* client) {
- LOG(INFO) << "connect url=" << url;
+ VLOG(1) << "connect url=" << url;
DCHECK(!context_->client());
context_->set_client(client);
generated by cgit v1.1 at 2025-01-09 02:57:46 +0000