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

Side by Side Diff: Source/core/frame/FrameConsole.cpp

Issue 517213003: Oilpan: fix build after r181083 (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 3 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) 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2013 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 48
49 int muteCount = 0; 49 int muteCount = 0;
50 50
51 } 51 }
52 52
53 FrameConsole::FrameConsole(LocalFrame& frame) 53 FrameConsole::FrameConsole(LocalFrame& frame)
54 : m_frame(frame) 54 : m_frame(frame)
55 { 55 {
56 } 56 }
57 57
58 FrameConsole::~FrameConsole()
59 {
60 }
61
62 void FrameConsole::addMessage(PassRefPtrWillBeRawPtr<ConsoleMessage> prpConsoleM essage) 58 void FrameConsole::addMessage(PassRefPtrWillBeRawPtr<ConsoleMessage> prpConsoleM essage)
63 { 59 {
64 RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = prpConsoleMessage; 60 RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = prpConsoleMessage;
65 if (muteCount && consoleMessage->source() != ConsoleAPIMessageSource) 61 if (muteCount && consoleMessage->source() != ConsoleAPIMessageSource)
66 return; 62 return;
67 63
68 // FIXME: This should not need to reach for the main-frame. 64 // FIXME: This should not need to reach for the main-frame.
69 // Inspector code should just take the current frame and know how to walk it self. 65 // Inspector code should just take the current frame and know how to walk it self.
70 ExecutionContext* context = m_frame.document(); 66 ExecutionContext* context = m_frame.document();
71 if (!context) 67 if (!context)
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 if (!m_consoleMessageStorage) 144 if (!m_consoleMessageStorage)
149 m_consoleMessageStorage = ConsoleMessageStorage::createForFrame(&m_frame ); 145 m_consoleMessageStorage = ConsoleMessageStorage::createForFrame(&m_frame );
150 return m_consoleMessageStorage.get(); 146 return m_consoleMessageStorage.get();
151 } 147 }
152 148
153 void FrameConsole::adoptWorkerConsoleMessages(WorkerGlobalScopeProxy* proxy) 149 void FrameConsole::adoptWorkerConsoleMessages(WorkerGlobalScopeProxy* proxy)
154 { 150 {
155 InspectorInstrumentation::adoptWorkerConsoleMessages(m_frame.document(), pro xy); 151 InspectorInstrumentation::adoptWorkerConsoleMessages(m_frame.document(), pro xy);
156 } 152 }
157 153
154 void FrameConsole::trace(Visitor* visitor)
155 {
156 visitor->trace(m_consoleMessageStorage);
157 }
158
158 } // namespace blink 159 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698