Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(155)

Side by Side Diff: Source/web/WebLocalFrameImpl.cpp

Issue 419203004: DevTools: wrapping arguments addConsoleMessage in ConsoleMessage (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@wrap-not-all-console-args
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 #include "core/frame/Settings.h" 103 #include "core/frame/Settings.h"
104 #include "core/html/HTMLAnchorElement.h" 104 #include "core/html/HTMLAnchorElement.h"
105 #include "core/html/HTMLCollection.h" 105 #include "core/html/HTMLCollection.h"
106 #include "core/html/HTMLFormElement.h" 106 #include "core/html/HTMLFormElement.h"
107 #include "core/html/HTMLFrameElementBase.h" 107 #include "core/html/HTMLFrameElementBase.h"
108 #include "core/html/HTMLFrameOwnerElement.h" 108 #include "core/html/HTMLFrameOwnerElement.h"
109 #include "core/html/HTMLHeadElement.h" 109 #include "core/html/HTMLHeadElement.h"
110 #include "core/html/HTMLInputElement.h" 110 #include "core/html/HTMLInputElement.h"
111 #include "core/html/HTMLLinkElement.h" 111 #include "core/html/HTMLLinkElement.h"
112 #include "core/html/PluginDocument.h" 112 #include "core/html/PluginDocument.h"
113 #include "core/inspector/ConsoleMessage.h"
113 #include "core/inspector/InspectorController.h" 114 #include "core/inspector/InspectorController.h"
114 #include "core/inspector/ScriptCallStack.h" 115 #include "core/inspector/ScriptCallStack.h"
115 #include "core/loader/DocumentLoader.h" 116 #include "core/loader/DocumentLoader.h"
116 #include "core/loader/FrameLoadRequest.h" 117 #include "core/loader/FrameLoadRequest.h"
117 #include "core/loader/FrameLoader.h" 118 #include "core/loader/FrameLoader.h"
118 #include "core/loader/HistoryItem.h" 119 #include "core/loader/HistoryItem.h"
119 #include "core/loader/SubstituteData.h" 120 #include "core/loader/SubstituteData.h"
120 #include "core/page/Chrome.h" 121 #include "core/page/Chrome.h"
121 #include "core/page/EventHandler.h" 122 #include "core/page/EventHandler.h"
122 #include "core/page/FocusController.h" 123 #include "core/page/FocusController.h"
(...skipping 618 matching lines...) Expand 10 before | Expand all | Expand 10 after
741 webCoreMessageLevel = WarningMessageLevel; 742 webCoreMessageLevel = WarningMessageLevel;
742 break; 743 break;
743 case WebConsoleMessage::LevelError: 744 case WebConsoleMessage::LevelError:
744 webCoreMessageLevel = ErrorMessageLevel; 745 webCoreMessageLevel = ErrorMessageLevel;
745 break; 746 break;
746 default: 747 default:
747 ASSERT_NOT_REACHED(); 748 ASSERT_NOT_REACHED();
748 return; 749 return;
749 } 750 }
750 751
751 frame()->document()->addConsoleMessage(OtherMessageSource, webCoreMessageLev el, message.text); 752 frame()->document()->addConsoleMessage(ConsoleMessage::create(OtherMessageSo urce, webCoreMessageLevel, message.text));
752 } 753 }
753 754
754 void WebLocalFrameImpl::collectGarbage() 755 void WebLocalFrameImpl::collectGarbage()
755 { 756 {
756 if (!frame()) 757 if (!frame())
757 return; 758 return;
758 if (!frame()->settings()->scriptEnabled()) 759 if (!frame()->settings()->scriptEnabled())
759 return; 760 return;
760 V8GCController::collectGarbage(v8::Isolate::GetCurrent()); 761 V8GCController::collectGarbage(v8::Isolate::GetCurrent());
761 } 762 }
(...skipping 1112 matching lines...) Expand 10 before | Expand all | Expand 10 after
1874 1875
1875 void WebLocalFrameImpl::invalidateAll() const 1876 void WebLocalFrameImpl::invalidateAll() const
1876 { 1877 {
1877 ASSERT(frame() && frame()->view()); 1878 ASSERT(frame() && frame()->view());
1878 FrameView* view = frame()->view(); 1879 FrameView* view = frame()->view();
1879 view->invalidateRect(view->frameRect()); 1880 view->invalidateRect(view->frameRect());
1880 invalidateScrollbar(); 1881 invalidateScrollbar();
1881 } 1882 }
1882 1883
1883 } // namespace blink 1884 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698