Merged Tip and Debug log levels for web console.

https://bugs.webkit.org/show_bug.cgi?id=109919

Patch by Dmitry Zvorygin <zvorygin@chromium.org> on 2013-02-26
Reviewed by Pavel Feldman.

In every component either TIP or DEBUG level was used for reporting,
but not both. This patch is prerequisite for Web Inspector console log filtering.

Source/WebCore:

* css/MediaList.cpp:
(WebCore::addResolutionWarningMessageToConsole):
* inspector/ConsoleMessage.cpp:
(WebCore::messageLevelValue):
* loader/appcache/ApplicationCacheGroup.cpp:
(WebCore::ApplicationCacheGroup::abort):
* page/Console.cpp:
(WebCore::printMessageSourceAndLevelPrefix):
* page/ConsoleTypes.h:
* xml/XSLTProcessorLibxslt.cpp:
(WebCore::XSLTProcessor::parseErrorFunc):
* xml/XSLTProcessorQt.cpp:
(WebCore::XSLTMessageHandler::handleMessage):

Source/WebKit/chromium:

* public/WebConsoleMessage.h:
* src/AssertMatchingEnums.cpp:
* src/WebFrameImpl.cpp:
(WebKit::WebFrameImpl::addMessageToConsole):

Source/WebKit/mac:

* WebCoreSupport/WebChromeClient.mm:
(stringForMessageLevel):
* WebView/WebUIDelegatePrivate.h:

Source/WebKit/wx:

* WebView.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@144064 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index a72c279..67efd74 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,27 @@
+2013-02-26  Dmitry Zvorygin  <zvorygin@chromium.org>
+
+        Merged Tip and Debug log levels for web console.
+        https://bugs.webkit.org/show_bug.cgi?id=109919
+
+        Reviewed by Pavel Feldman.
+
+        In every component either TIP or DEBUG level was used for reporting,
+        but not both. This patch is prerequisite for Web Inspector console log filtering.
+
+        * css/MediaList.cpp:
+        (WebCore::addResolutionWarningMessageToConsole):
+        * inspector/ConsoleMessage.cpp:
+        (WebCore::messageLevelValue):
+        * loader/appcache/ApplicationCacheGroup.cpp:
+        (WebCore::ApplicationCacheGroup::abort):
+        * page/Console.cpp:
+        (WebCore::printMessageSourceAndLevelPrefix):
+        * page/ConsoleTypes.h:
+        * xml/XSLTProcessorLibxslt.cpp:
+        (WebCore::XSLTProcessor::parseErrorFunc):
+        * xml/XSLTProcessorQt.cpp:
+        (WebCore::XSLTMessageHandler::handleMessage):
+
 2013-02-26  Alberto Garcia  <agarcia@igalia.com>
 
         [BlackBerry] Upstream the datalist support UI

diff --git a/Source/WebCore/css/MediaList.cpp b/Source/WebCore/css/MediaList.cpp
index 48579e4..b054cf1 100644 (file)
--- a/Source/WebCore/css/MediaList.cpp
+++ b/Source/WebCore/css/MediaList.cpp
@@ -326,7 +326,7 @@ static void addResolutionWarningMessageToConsole(Document* document, const Strin
 
     message.append(serializedExpression);
 
-    document->addConsoleMessage(HTMLMessageSource, TipMessageLevel, message);
+    document->addConsoleMessage(HTMLMessageSource, DebugMessageLevel, message);
 }
 
 void reportMediaQueryWarningIfNeeded(Document* document, const MediaQuerySet* mediaQuerySet)

diff --git a/Source/WebCore/inspector/ConsoleMessage.cpp b/Source/WebCore/inspector/ConsoleMessage.cpp
index de2ef04..54ed316 100644 (file)
--- a/Source/WebCore/inspector/ConsoleMessage.cpp
+++ b/Source/WebCore/inspector/ConsoleMessage.cpp
@@ -170,11 +170,10 @@ static TypeBuilder::Console::ConsoleMessage::Type::Enum messageTypeValue(Message
 static TypeBuilder::Console::ConsoleMessage::Level::Enum messageLevelValue(MessageLevel level)
 {
     switch (level) {
-    case TipMessageLevel: return TypeBuilder::Console::ConsoleMessage::Level::Tip;
+    case DebugMessageLevel: return TypeBuilder::Console::ConsoleMessage::Level::Debug;
     case LogMessageLevel: return TypeBuilder::Console::ConsoleMessage::Level::Log;
     case WarningMessageLevel: return TypeBuilder::Console::ConsoleMessage::Level::Warning;
     case ErrorMessageLevel: return TypeBuilder::Console::ConsoleMessage::Level::Error;
-    case DebugMessageLevel: return TypeBuilder::Console::ConsoleMessage::Level::Debug;
     }
     return TypeBuilder::Console::ConsoleMessage::Level::Log;
 }

diff --git a/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp b/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp
index 2ee9de8..b6cb2dd 100644 (file)
--- a/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp
+++ b/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp
@@ -474,7 +474,7 @@ void ApplicationCacheGroup::abort(Frame* frame)
     if (m_completionType != None)
         return;
 
-    frame->document()->addConsoleMessage(OtherMessageSource, TipMessageLevel, "Application Cache download process was aborted.");
+    frame->document()->addConsoleMessage(OtherMessageSource, DebugMessageLevel, "Application Cache download process was aborted.");
     cacheUpdateFailed();
 }
 

diff --git a/Source/WebCore/page/Console.cpp b/Source/WebCore/page/Console.cpp
index 708e8e9..f398c25 100644 (file)
--- a/Source/WebCore/page/Console.cpp
+++ b/Source/WebCore/page/Console.cpp
@@ -114,8 +114,8 @@ static void printMessageSourceAndLevelPrefix(MessageSource source, MessageLevel
 
     const char* levelString;
     switch (level) {
-    case TipMessageLevel:
-        levelString = "TIP";
+    case DebugMessageLevel:
+        levelString = "DEBUG";
         break;
     case LogMessageLevel:
         levelString = "LOG";
@@ -126,9 +126,6 @@ static void printMessageSourceAndLevelPrefix(MessageSource source, MessageLevel
     case ErrorMessageLevel:
         levelString = "ERROR";
         break;
-    case DebugMessageLevel:
-        levelString = "DEBUG";
-        break;
     default:
         ASSERT_NOT_REACHED();
         levelString = "UNKNOWN";

diff --git a/Source/WebCore/page/ConsoleTypes.h b/Source/WebCore/page/ConsoleTypes.h
index 5becf06..810da1f 100644 (file)
--- a/Source/WebCore/page/ConsoleTypes.h
+++ b/Source/WebCore/page/ConsoleTypes.h
@@ -38,11 +38,10 @@ enum MessageSource {
 };
 
 enum MessageLevel {
-    TipMessageLevel,
-    LogMessageLevel,
-    WarningMessageLevel,
-    ErrorMessageLevel,
-    DebugMessageLevel
+    DebugMessageLevel = 4,
+    LogMessageLevel = 1,
+    WarningMessageLevel = 2,
+    ErrorMessageLevel = 3
 };
 
 } // namespace WebCore

diff --git a/Source/WebCore/xml/XSLTProcessorLibxslt.cpp b/Source/WebCore/xml/XSLTProcessorLibxslt.cpp
index 0b2ff1b..503802c 100644 (file)
--- a/Source/WebCore/xml/XSLTProcessorLibxslt.cpp
+++ b/Source/WebCore/xml/XSLTProcessorLibxslt.cpp
@@ -89,7 +89,7 @@ void XSLTProcessor::parseErrorFunc(void* userData, xmlError* error)
     MessageLevel level;
     switch (error->level) {
     case XML_ERR_NONE:
-        level = TipMessageLevel;
+        level = DebugMessageLevel;
         break;
     case XML_ERR_WARNING:
         level = WarningMessageLevel;

diff --git a/Source/WebCore/xml/XSLTProcessorQt.cpp b/Source/WebCore/xml/XSLTProcessorQt.cpp
index 6bf3f24..70ad752 100644 (file)
--- a/Source/WebCore/xml/XSLTProcessorQt.cpp
+++ b/Source/WebCore/xml/XSLTProcessorQt.cpp
@@ -69,7 +69,7 @@ void XSLTMessageHandler::handleMessage(QtMsgType type, const QString& descriptio
     MessageLevel level;
     switch (type) {
     case QtDebugMsg:
-        level = TipMessageLevel;
+        level = DebugMessageLevel;
         break;
     case QtWarningMsg:
         level = WarningMessageLevel;

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 6cf8e30..4df244a 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,18 @@
+2013-02-26  Dmitry Zvorygin  <zvorygin@chromium.org>
+
+        Merged Tip and Debug log levels for web console.
+        https://bugs.webkit.org/show_bug.cgi?id=109919
+
+        Reviewed by Pavel Feldman.
+
+        In every component either TIP or DEBUG level was used for reporting,
+        but not both. This patch is prerequisite for Web Inspector console log filtering.
+
+        * public/WebConsoleMessage.h:
+        * src/AssertMatchingEnums.cpp:
+        * src/WebFrameImpl.cpp:
+        (WebKit::WebFrameImpl::addMessageToConsole):
+
 2013-02-26  Andrey Kosyakov  <caseq@chromium.org>
 
         Plumbing trace events to Timeline

diff --git a/Source/WebKit/chromium/public/WebConsoleMessage.h b/Source/WebKit/chromium/public/WebConsoleMessage.h
index 0b1f5a0..da01dd7 100644 (file)
--- a/Source/WebKit/chromium/public/WebConsoleMessage.h
+++ b/Source/WebKit/chromium/public/WebConsoleMessage.h
@@ -37,11 +37,10 @@ namespace WebKit {
 
 struct WebConsoleMessage {
     enum Level {
-        LevelTip,
-        LevelLog,
-        LevelWarning,
-        LevelError,
-        LevelDebug
+        LevelDebug = 4,
+        LevelLog = 1,
+        LevelWarning = 2,
+        LevelError = 3,
     };
 
     Level level;

diff --git a/Source/WebKit/chromium/src/AssertMatchingEnums.cpp b/Source/WebKit/chromium/src/AssertMatchingEnums.cpp
index f6b2bba..8ad0844 100644 (file)
--- a/Source/WebKit/chromium/src/AssertMatchingEnums.cpp
+++ b/Source/WebKit/chromium/src/AssertMatchingEnums.cpp
@@ -640,8 +640,7 @@ COMPILE_ASSERT_MATCHING_ENUM(WebURLRequest::PriorityMedium, ResourceLoadPriority
 COMPILE_ASSERT_MATCHING_ENUM(WebURLRequest::PriorityHigh, ResourceLoadPriorityHigh);
 COMPILE_ASSERT_MATCHING_ENUM(WebURLRequest::PriorityVeryHigh, ResourceLoadPriorityVeryHigh);
 
-COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelTip, TipMessageLevel);
+COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelDebug, DebugMessageLevel);
 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelLog, LogMessageLevel);
 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelWarning, WarningMessageLevel);
 COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelError, ErrorMessageLevel);
-COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelDebug, DebugMessageLevel);

diff --git a/Source/WebKit/chromium/src/WebFrameImpl.cpp b/Source/WebKit/chromium/src/WebFrameImpl.cpp
index 32a29f8..3cdf503 100644 (file)
--- a/Source/WebKit/chromium/src/WebFrameImpl.cpp
+++ b/Source/WebKit/chromium/src/WebFrameImpl.cpp
@@ -819,8 +819,8 @@ void WebFrameImpl::addMessageToConsole(const WebConsoleMessage& message)
 
     MessageLevel webCoreMessageLevel;
     switch (message.level) {
-    case WebConsoleMessage::LevelTip:
-        webCoreMessageLevel = TipMessageLevel;
+    case WebConsoleMessage::LevelDebug:
+        webCoreMessageLevel = DebugMessageLevel;
         break;
     case WebConsoleMessage::LevelLog:
         webCoreMessageLevel = LogMessageLevel;
@@ -831,9 +831,6 @@ void WebFrameImpl::addMessageToConsole(const WebConsoleMessage& message)
     case WebConsoleMessage::LevelError:
         webCoreMessageLevel = ErrorMessageLevel;
         break;
-    case WebConsoleMessage::LevelDebug:
-        webCoreMessageLevel = DebugMessageLevel;
-        break;
     default:
         ASSERT_NOT_REACHED();
         return;

diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
index be424d7..89394c7 100644 (file)
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,18 @@
+2013-02-26  Dmitry Zvorygin  <zvorygin@chromium.org>
+
+        Merged Tip and Debug log levels for web console.
+        https://bugs.webkit.org/show_bug.cgi?id=109919
+
+        Reviewed by Pavel Feldman.
+
+        In every component either TIP or DEBUG level was used for reporting,
+        but not both. This patch is prerequisite for Web Inspector console log filtering.
+
+        * WebCoreSupport/WebChromeClient.mm:
+        (stringForMessageLevel):
+        * WebView/WebUIDelegatePrivate.h:
+
+
 2013-02-21  Jeffrey Pfau  <jpfau@apple.com>
 
         Optionally partition cache to prevent using cache for tracking

diff --git a/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm b/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm
index 8e200eb..a3095e6 100644 (file)
--- a/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm
+++ b/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm
@@ -97,11 +97,11 @@ NSString *WebConsoleMessageNetworkMessageSource = @"NetworkMessageSource";
 NSString *WebConsoleMessageConsoleAPIMessageSource = @"ConsoleAPIMessageSource";
 NSString *WebConsoleMessageOtherMessageSource = @"OtherMessageSource";
 
-NSString *WebConsoleMessageTipMessageLevel = @"TipMessageLevel";
+NSString *WebConsoleMessageDebugMessageLevel = @"DebugMessageLevel";
 NSString *WebConsoleMessageLogMessageLevel = @"LogMessageLevel";
 NSString *WebConsoleMessageWarningMessageLevel = @"WarningMessageLevel";
 NSString *WebConsoleMessageErrorMessageLevel = @"ErrorMessageLevel";
-NSString *WebConsoleMessageDebugMessageLevel = @"DebugMessageLevel";
+
 
 @interface NSApplication (WebNSApplicationDetails)
 - (NSCursor *)_cursorRectCursor;
@@ -349,16 +349,14 @@ inline static NSString *stringForMessageSource(MessageSource source)
 inline static NSString *stringForMessageLevel(MessageLevel level)
 {
     switch (level) {
-    case TipMessageLevel:
-        return WebConsoleMessageTipMessageLevel;
+    case DebugMessageLevel:
+        return WebConsoleMessageDebugMessageLevel;
     case LogMessageLevel:
         return WebConsoleMessageLogMessageLevel;
     case WarningMessageLevel:
         return WebConsoleMessageWarningMessageLevel;
     case ErrorMessageLevel:
         return WebConsoleMessageErrorMessageLevel;
-    case DebugMessageLevel:
-        return WebConsoleMessageDebugMessageLevel;
     }
     ASSERT_NOT_REACHED();
     return @"";

diff --git a/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h b/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h
index 3f240ea..cc03463 100644 (file)
--- a/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h
+++ b/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h
@@ -112,11 +112,10 @@ extern NSString *WebConsoleMessageConsoleAPIMessageSource;
 extern NSString *WebConsoleMessageOtherMessageSource;
 
 // Message Levels.
-extern NSString *WebConsoleMessageTipMessageLevel;
+extern NSString *WebConsoleMessageDebugMessageLevel;
 extern NSString *WebConsoleMessageLogMessageLevel;
 extern NSString *WebConsoleMessageWarningMessageLevel;
 extern NSString *WebConsoleMessageErrorMessageLevel;
-extern NSString *WebConsoleMessageDebugMessageLevel;
 
 @class DOMElement;
 @class DOMNode;
@@ -161,8 +160,8 @@ extern NSString *WebConsoleMessageDebugMessageLevel;
         </dd>
         <dt>MessageLevel</dt>
         <dd>
-            Severity level of the message. Tip, Log, Warning, etc.
-            See WebConsoleMessageTipMessageLevel and similar constants.
+            Severity level of the message. Debug, Log, Warning, etc.
+            See WebConsoleMessageDebugMessageLevel and similar constants.
         </dd>
     </dl>
 */

diff --git a/Source/WebKit/wx/ChangeLog b/Source/WebKit/wx/ChangeLog
index 1838f44..0324e21 100644 (file)
--- a/Source/WebKit/wx/ChangeLog
+++ b/Source/WebKit/wx/ChangeLog
@@ -1,3 +1,15 @@
+2013-02-26  Dmitry Zvorygin  <zvorygin@chromium.org>
+
+        Merged Tip and Debug log levels for web console.
+        https://bugs.webkit.org/show_bug.cgi?id=109919
+
+        Reviewed by Pavel Feldman.
+
+        In every component either TIP or DEBUG level was used for reporting,
+        but not both. This patch is prerequisite for Web Inspector console log filtering.
+
+        * WebView.h:
+
 2013-02-15  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 
         Simplify hitTestResultAtPoint and nodesFromRect APIs

diff --git a/Source/WebKit/wx/WebView.h b/Source/WebKit/wx/WebView.h
index 3ad690c..ceb1879 100644 (file)
--- a/Source/WebKit/wx/WebView.h
+++ b/Source/WebKit/wx/WebView.h
@@ -419,10 +419,10 @@ private:
 
 // copied from page/Console.h
 enum WebViewConsoleMessageLevel {
-    TipMessageLevel,
-    LogMessageLevel,
-    WarningMessageLevel,
-    ErrorMessageLevel
+    DebugMessageLevel = 4,
+    LogMessageLevel = 1,
+    WarningMessageLevel = 2,
+    ErrorMessageLevel = 3
 };
 
 class WXDLLIMPEXP_WEBKIT WebViewConsoleMessageEvent : public wxCommandEvent