Changeset 141006 in webkit

Timestamp:

Jan 28, 2013 1:47:44 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium] WebConsoleMessage is missing LevelDebug (chromium bug 172416)
​https://bugs.webkit.org/show_bug.cgi?id=108004
​http://code.google.com/p/chromium/issues/detail?id=172416

console.debug triggers a NOTREACHED() assertation in Chromium. This
is because WebCore::MessageLevel contains 5 levels, including debug,
where WebConsoleMessage::Level is missing a "debug" level. Add a
WebConsoleMessage::LevelDebug so that it can get passed up to the
renderer even if it doesn't make use of that now.

Requires another patch to chromium itself to fix chromium bug 172416
but this is a prerequisite.

Also add an enum compile time check to AssertMatchingEnums.cpp,

Patch by Kevin Day <​kevinday@gmail.com> on 2013-01-28
Reviewed by Jochen Eisinger.

• public/WebConsoleMessage.h:
• src/AssertMatchingEnums.cpp:
• src/WebFrameImpl.cpp:

(WebKit::WebFrameImpl::addMessageToConsole):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebConsoleMessage.h (modified) (1 diff)
• src/AssertMatchingEnums.cpp (modified) (2 diffs)
• src/WebFrameImpl.cpp (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2013-01-28  Kevin Day  <kevinday@gmail.com>
+
+        [chromium] WebConsoleMessage is missing LevelDebug (chromium bug 172416)
+        https://bugs.webkit.org/show_bug.cgi?id=108004
+        http://code.google.com/p/chromium/issues/detail?id=172416
+
+        console.debug triggers a NOTREACHED() assertation in Chromium. This
+        is because WebCore::MessageLevel contains 5 levels, including debug,
+        where WebConsoleMessage::Level is missing a "debug" level. Add a
+        WebConsoleMessage::LevelDebug so that it can get passed up to the
+        renderer even if it doesn't make use of that now.
+
+        Requires another patch to chromium itself to fix chromium bug 172416
+        but this is a prerequisite.
+
+        Also add an enum compile time check to AssertMatchingEnums.cpp,
+
+        Reviewed by Jochen Eisinger.
+
+        * public/WebConsoleMessage.h:
+        * src/AssertMatchingEnums.cpp:
+        * src/WebFrameImpl.cpp:
+        (WebKit::WebFrameImpl::addMessageToConsole):
+
 2013-01-28  Xianzhu Wang  <wangxianzhu@chromium.org>
 

trunk/Source/WebKit/chromium/public/WebConsoleMessage.h

@@ -41 +41 @@
         LevelLog,
         LevelWarning,
-        LevelError
+        LevelError,
+        LevelDebug
     };
 

trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp

@@ -117 +117 @@
 #include "WebView.h"
 #include <public/WebClipboard.h>
+#include <public/WebConsoleMessage.h>
 #include <public/WebFileSystem.h>
 #include <public/WebFilterOperation.h>
@@ -635 +636 @@
 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::LevelLog, LogMessageLevel);
+COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelWarning, WarningMessageLevel);
+COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelError, ErrorMessageLevel);
+COMPILE_ASSERT_MATCHING_ENUM(WebConsoleMessage::LevelDebug, DebugMessageLevel);

trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp

@@ -838 +838 @@
         webCoreMessageLevel = ErrorMessageLevel;
         break;
+    case WebConsoleMessage::LevelDebug:
+        webCoreMessageLevel = DebugMessageLevel;
+        break;
     default:
         ASSERT_NOT_REACHED();