diff options
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/appcache/appcache_interfaces.cc | 4 | ||||
| -rw-r--r-- | webkit/appcache/appcache_interfaces.h | 9 | ||||
| -rw-r--r-- | webkit/plugins/ppapi/host_globals.cc | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/webkit/appcache/appcache_interfaces.cc b/webkit/appcache/appcache_interfaces.cc index 3f3d1d7..bbc222c 100644 --- a/webkit/appcache/appcache_interfaces.cc +++ b/webkit/appcache/appcache_interfaces.cc @@ -113,8 +113,8 @@ COMPILE_ASSERT((int)WebApplicationCacheHost::CachedEvent == (int)CACHED_EVENT, CachedEvent); COMPILE_ASSERT((int)WebApplicationCacheHost::ObsoleteEvent == (int)OBSOLETE_EVENT, ObsoleteEvent); -COMPILE_ASSERT((int)WebConsoleMessage::LevelTip == - (int)LOG_TIP, LevelTip); +COMPILE_ASSERT((int)WebConsoleMessage::LevelDebug == + (int)LOG_DEBUG, LevelDebug); COMPILE_ASSERT((int)WebConsoleMessage::LevelLog == (int)LOG_INFO, LevelLog); COMPILE_ASSERT((int)WebConsoleMessage::LevelWarning == diff --git a/webkit/appcache/appcache_interfaces.h b/webkit/appcache/appcache_interfaces.h index 78752b1..bae673b 100644 --- a/webkit/appcache/appcache_interfaces.h +++ b/webkit/appcache/appcache_interfaces.h @@ -47,11 +47,12 @@ enum EventID { OBSOLETE_EVENT }; +// Temporarily renumber them in wierd way, to help remove LOG_TIP from WebKit enum LogLevel { - LOG_TIP, - LOG_INFO, - LOG_WARNING, - LOG_ERROR, + LOG_DEBUG = 4, + LOG_INFO = 1, + LOG_WARNING = 2, + LOG_ERROR = 3, }; enum NamespaceType { diff --git a/webkit/plugins/ppapi/host_globals.cc b/webkit/plugins/ppapi/host_globals.cc index 32fac79..6370269 100644 --- a/webkit/plugins/ppapi/host_globals.cc +++ b/webkit/plugins/ppapi/host_globals.cc @@ -48,7 +48,7 @@ void GetAllContainersForModule(PluginModule* module, WebConsoleMessage::Level LogLevelToWebLogLevel(PP_LogLevel level) { switch (level) { case PP_LOGLEVEL_TIP: - return WebConsoleMessage::LevelTip; + return WebConsoleMessage::LevelDebug; case PP_LOGLEVEL_LOG: return WebConsoleMessage::LevelLog; case PP_LOGLEVEL_WARNING: |