Title: [141021] trunk/Source/WebKit/chromium
- Revision
- 141021
- Author
- [email protected]
- Date
- 2013-01-28 15:48:46 -0800 (Mon, 28 Jan 2013)
Log Message
Unreviewed, rolling out r141006.
http://trac.webkit.org/changeset/141006
https://bugs.webkit.org/show_bug.cgi?id=108123
Broke chromium build (Requested by arv on #webkit).
Patch by Sheriff Bot <[email protected]> on 2013-01-28
* public/WebConsoleMessage.h:
* src/AssertMatchingEnums.cpp:
* src/WebFrameImpl.cpp:
(WebKit::WebFrameImpl::addMessageToConsole):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (141020 => 141021)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-01-28 23:40:01 UTC (rev 141020)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-01-28 23:48:46 UTC (rev 141021)
@@ -1,3 +1,16 @@
+2013-01-28 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r141006.
+ http://trac.webkit.org/changeset/141006
+ https://bugs.webkit.org/show_bug.cgi?id=108123
+
+ Broke chromium build (Requested by arv on #webkit).
+
+ * public/WebConsoleMessage.h:
+ * src/AssertMatchingEnums.cpp:
+ * src/WebFrameImpl.cpp:
+ (WebKit::WebFrameImpl::addMessageToConsole):
+
2013-01-28 Min Qin <[email protected]>
adding support for DiscardablePixelRef for caching lazily decoded images
Modified: trunk/Source/WebKit/chromium/public/WebConsoleMessage.h (141020 => 141021)
--- trunk/Source/WebKit/chromium/public/WebConsoleMessage.h 2013-01-28 23:40:01 UTC (rev 141020)
+++ trunk/Source/WebKit/chromium/public/WebConsoleMessage.h 2013-01-28 23:48:46 UTC (rev 141021)
@@ -40,8 +40,7 @@
LevelTip,
LevelLog,
LevelWarning,
- LevelError,
- LevelDebug
+ LevelError
};
Level level;
Modified: trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp (141020 => 141021)
--- trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2013-01-28 23:40:01 UTC (rev 141020)
+++ trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2013-01-28 23:48:46 UTC (rev 141021)
@@ -635,9 +635,3 @@
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 (141020 => 141021)
--- trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp 2013-01-28 23:40:01 UTC (rev 141020)
+++ trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp 2013-01-28 23:48:46 UTC (rev 141021)
@@ -837,9 +837,6 @@
case WebConsoleMessage::LevelError:
webCoreMessageLevel = ErrorMessageLevel;
break;
- case WebConsoleMessage::LevelDebug:
- webCoreMessageLevel = DebugMessageLevel;
- break;
default:
ASSERT_NOT_REACHED();
return;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
