| 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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 #include "core/frame/FrameView.h" | 102 #include "core/frame/FrameView.h" |
| 103 #include "core/frame/Settings.h" | 103 #include "core/frame/Settings.h" |
| 104 #include "core/html/HTMLCollection.h" | 104 #include "core/html/HTMLCollection.h" |
| 105 #include "core/html/HTMLFormElement.h" | 105 #include "core/html/HTMLFormElement.h" |
| 106 #include "core/html/HTMLFrameElementBase.h" | 106 #include "core/html/HTMLFrameElementBase.h" |
| 107 #include "core/html/HTMLFrameOwnerElement.h" | 107 #include "core/html/HTMLFrameOwnerElement.h" |
| 108 #include "core/html/HTMLHeadElement.h" | 108 #include "core/html/HTMLHeadElement.h" |
| 109 #include "core/html/HTMLInputElement.h" | 109 #include "core/html/HTMLInputElement.h" |
| 110 #include "core/html/HTMLLinkElement.h" | 110 #include "core/html/HTMLLinkElement.h" |
| 111 #include "core/html/PluginDocument.h" | 111 #include "core/html/PluginDocument.h" |
| 112 #include "core/inspector/ConsoleMessage.h" |
| 112 #include "core/inspector/InspectorController.h" | 113 #include "core/inspector/InspectorController.h" |
| 113 #include "core/inspector/ScriptCallStack.h" | 114 #include "core/inspector/ScriptCallStack.h" |
| 114 #include "core/loader/DocumentLoader.h" | 115 #include "core/loader/DocumentLoader.h" |
| 115 #include "core/loader/FrameLoadRequest.h" | 116 #include "core/loader/FrameLoadRequest.h" |
| 116 #include "core/loader/FrameLoader.h" | 117 #include "core/loader/FrameLoader.h" |
| 117 #include "core/loader/HistoryItem.h" | 118 #include "core/loader/HistoryItem.h" |
| 118 #include "core/loader/SubstituteData.h" | 119 #include "core/loader/SubstituteData.h" |
| 119 #include "core/page/Chrome.h" | 120 #include "core/page/Chrome.h" |
| 120 #include "core/page/EventHandler.h" | 121 #include "core/page/EventHandler.h" |
| 121 #include "core/page/FocusController.h" | 122 #include "core/page/FocusController.h" |
| (...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 742 webCoreMessageLevel = WarningMessageLevel; | 743 webCoreMessageLevel = WarningMessageLevel; |
| 743 break; | 744 break; |
| 744 case WebConsoleMessage::LevelError: | 745 case WebConsoleMessage::LevelError: |
| 745 webCoreMessageLevel = ErrorMessageLevel; | 746 webCoreMessageLevel = ErrorMessageLevel; |
| 746 break; | 747 break; |
| 747 default: | 748 default: |
| 748 ASSERT_NOT_REACHED(); | 749 ASSERT_NOT_REACHED(); |
| 749 return; | 750 return; |
| 750 } | 751 } |
| 751 | 752 |
| 752 frame()->document()->addConsoleMessage(OtherMessageSource, webCoreMessageLev
el, message.text); | 753 frame()->document()->addConsoleMessage(ConsoleMessage::create(OtherMessageSo
urce, webCoreMessageLevel, message.text)); |
| 753 } | 754 } |
| 754 | 755 |
| 755 void WebLocalFrameImpl::collectGarbage() | 756 void WebLocalFrameImpl::collectGarbage() |
| 756 { | 757 { |
| 757 if (!frame()) | 758 if (!frame()) |
| 758 return; | 759 return; |
| 759 if (!frame()->settings()->scriptEnabled()) | 760 if (!frame()->settings()->scriptEnabled()) |
| 760 return; | 761 return; |
| 761 V8GCController::collectGarbage(v8::Isolate::GetCurrent()); | 762 V8GCController::collectGarbage(v8::Isolate::GetCurrent()); |
| 762 } | 763 } |
| (...skipping 1078 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1841 | 1842 |
| 1842 void WebLocalFrameImpl::invalidateAll() const | 1843 void WebLocalFrameImpl::invalidateAll() const |
| 1843 { | 1844 { |
| 1844 ASSERT(frame() && frame()->view()); | 1845 ASSERT(frame() && frame()->view()); |
| 1845 FrameView* view = frame()->view(); | 1846 FrameView* view = frame()->view(); |
| 1846 view->invalidateRect(view->frameRect()); | 1847 view->invalidateRect(view->frameRect()); |
| 1847 invalidateScrollbar(); | 1848 invalidateScrollbar(); |
| 1848 } | 1849 } |
| 1849 | 1850 |
| 1850 } // namespace blink | 1851 } // namespace blink |
| OLD | NEW |