Title: [141006] trunk/Source/WebKit/chromium
- Revision
- 141006
- Author
- commit-qu...@webkit.org
- Date
- 2013-01-28 13:47:44 -0800 (Mon, 28 Jan 2013)
Log 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 <kevin...@gmail.com> on 2013-01-28
Reviewed by Jochen Eisinger.
* public/WebConsoleMessage.h:
* src/AssertMatchingEnums.cpp:
* src/WebFrameImpl.cpp:
(WebKit::WebFrameImpl::addMessageToConsole):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (141005 => 141006)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-01-28 21:45:11 UTC (rev 141005)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-01-28 21:47:44 UTC (rev 141006)
@@ -1,3 +1,27 @@
+2013-01-28 Kevin Day <kevin...@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 <wangxian...@chromium.org>
[Chromium] Correct auto-zoom when using compositor scaling
Modified: trunk/Source/WebKit/chromium/public/WebConsoleMessage.h (141005 => 141006)
--- trunk/Source/WebKit/chromium/public/WebConsoleMessage.h 2013-01-28 21:45:11 UTC (rev 141005)
+++ trunk/Source/WebKit/chromium/public/WebConsoleMessage.h 2013-01-28 21:47:44 UTC (rev 141006)
@@ -40,7 +40,8 @@
LevelTip,
LevelLog,
LevelWarning,
- LevelError
+ LevelError,
+ LevelDebug
};
Level level;
Modified: trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp (141005 => 141006)
--- trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2013-01-28 21:45:11 UTC (rev 141005)
+++ trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2013-01-28 21:47:44 UTC (rev 141006)
@@ -116,6 +116,7 @@
#include "WebTextCheckingType.h"
#include "WebView.h"
#include <public/WebClipboard.h>
+#include <public/WebConsoleMessage.h>
#include <public/WebFileSystem.h>
#include <public/WebFilterOperation.h>
#include <public/WebMediaStreamSource.h>
@@ -634,3 +635,9 @@
COMPILE_ASSERT_MATCHING_ENUM(WebURLRequest::PriorityMedium, ResourceLoadPriorityMedium);
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);
Modified: trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp (141005 => 141006)
--- trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp 2013-01-28 21:45:11 UTC (rev 141005)
+++ trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp 2013-01-28 21:47:44 UTC (rev 141006)
@@ -837,6 +837,9 @@
case WebConsoleMessage::LevelError:
webCoreMessageLevel = ErrorMessageLevel;
break;
+ case WebConsoleMessage::LevelDebug:
+ webCoreMessageLevel = DebugMessageLevel;
+ break;
default:
ASSERT_NOT_REACHED();
return;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
