OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 683 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
694 int worldID, | 694 int worldID, |
695 const WebString& humanReadableName) { | 695 const WebString& humanReadableName) { |
696 DCHECK(frame()); | 696 DCHECK(frame()); |
697 DOMWrapperWorld::setIsolatedWorldHumanReadableName(worldID, | 697 DOMWrapperWorld::setIsolatedWorldHumanReadableName(worldID, |
698 humanReadableName); | 698 humanReadableName); |
699 } | 699 } |
700 | 700 |
701 void WebLocalFrameImpl::addMessageToConsole(const WebConsoleMessage& message) { | 701 void WebLocalFrameImpl::addMessageToConsole(const WebConsoleMessage& message) { |
702 DCHECK(frame()); | 702 DCHECK(frame()); |
703 | 703 |
704 MessageLevel webCoreMessageLevel = LogMessageLevel; | 704 MessageLevel webCoreMessageLevel = InfoMessageLevel; |
705 switch (message.level) { | 705 switch (message.level) { |
706 case WebConsoleMessage::LevelDebug: | 706 case WebConsoleMessage::LevelVerbose: |
707 webCoreMessageLevel = DebugMessageLevel; | 707 webCoreMessageLevel = VerboseMessageLevel; |
708 break; | 708 break; |
709 case WebConsoleMessage::LevelLog: | 709 case WebConsoleMessage::LevelInfo: |
710 webCoreMessageLevel = LogMessageLevel; | 710 webCoreMessageLevel = InfoMessageLevel; |
711 break; | 711 break; |
712 case WebConsoleMessage::LevelWarning: | 712 case WebConsoleMessage::LevelWarning: |
713 webCoreMessageLevel = WarningMessageLevel; | 713 webCoreMessageLevel = WarningMessageLevel; |
714 break; | 714 break; |
715 case WebConsoleMessage::LevelError: | 715 case WebConsoleMessage::LevelError: |
716 webCoreMessageLevel = ErrorMessageLevel; | 716 webCoreMessageLevel = ErrorMessageLevel; |
717 break; | 717 break; |
718 // Unsupported values. | |
719 case WebConsoleMessage::LevelInfo: | |
720 break; | |
721 } | 718 } |
722 | 719 |
723 frame()->document()->addConsoleMessage(ConsoleMessage::create( | 720 frame()->document()->addConsoleMessage(ConsoleMessage::create( |
724 OtherMessageSource, webCoreMessageLevel, message.text, | 721 OtherMessageSource, webCoreMessageLevel, message.text, |
725 SourceLocation::create(message.url, message.lineNumber, | 722 SourceLocation::create(message.url, message.lineNumber, |
726 message.columnNumber, nullptr))); | 723 message.columnNumber, nullptr))); |
727 } | 724 } |
728 | 725 |
729 void WebLocalFrameImpl::collectGarbage() { | 726 void WebLocalFrameImpl::collectGarbage() { |
730 if (!frame()) | 727 if (!frame()) |
(...skipping 1623 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2354 ->frameScheduler() | 2351 ->frameScheduler() |
2355 ->unthrottledTaskRunner() | 2352 ->unthrottledTaskRunner() |
2356 ->toSingleThreadTaskRunner(); | 2353 ->toSingleThreadTaskRunner(); |
2357 } | 2354 } |
2358 | 2355 |
2359 WebInputMethodControllerImpl* WebLocalFrameImpl::inputMethodController() const { | 2356 WebInputMethodControllerImpl* WebLocalFrameImpl::inputMethodController() const { |
2360 return m_inputMethodController.get(); | 2357 return m_inputMethodController.get(); |
2361 } | 2358 } |
2362 | 2359 |
2363 } // namespace blink | 2360 } // namespace blink |
OLD | NEW |