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

Unified Diff: sky/engine/core/frame/ConsoleBase.h

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/frame/Console.idl ('k') | sky/engine/core/frame/ConsoleBase.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/frame/ConsoleBase.h
diff --git a/sky/engine/core/frame/ConsoleBase.h b/sky/engine/core/frame/ConsoleBase.h
deleted file mode 100644
index 8a5096a1e116fa8346b05250c01b07c93480aa1d..0000000000000000000000000000000000000000
--- a/sky/engine/core/frame/ConsoleBase.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (C) 2007 Apple Inc. All rights reserved.
- * Copyright (C) 2013 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef SKY_ENGINE_CORE_FRAME_CONSOLEBASE_H_
-#define SKY_ENGINE_CORE_FRAME_CONSOLEBASE_H_
-
-#include "sky/engine/bindings/core/v8/ScriptState.h"
-#include "sky/engine/bindings/core/v8/ScriptWrappable.h"
-#include "sky/engine/core/frame/ConsoleTypes.h"
-#include "sky/engine/core/frame/DOMWindowProperty.h"
-#include "sky/engine/core/inspector/ConsoleAPITypes.h"
-#include "sky/engine/core/inspector/ScriptCallStack.h"
-#include "sky/engine/platform/heap/Handle.h"
-#include "sky/engine/wtf/Forward.h"
-#include "sky/engine/wtf/HashCountedSet.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
-
-namespace blink {
-
-class ConsoleMessage;
-class ScriptArguments;
-
-class ConsoleBase : public RefCounted<ConsoleBase>, public ScriptWrappable {
- DEFINE_WRAPPERTYPEINFO();
-public:
- void debug(ScriptState*, PassRefPtr<ScriptArguments>);
- void error(ScriptState*, PassRefPtr<ScriptArguments>);
- void info(ScriptState*, PassRefPtr<ScriptArguments>);
- void log(ScriptState*, PassRefPtr<ScriptArguments>);
- void clear(ScriptState*, PassRefPtr<ScriptArguments>);
- void warn(ScriptState*, PassRefPtr<ScriptArguments>);
- void dir(ScriptState*, PassRefPtr<ScriptArguments>);
- void dirxml(ScriptState*, PassRefPtr<ScriptArguments>);
- void table(ScriptState*, PassRefPtr<ScriptArguments>);
- void trace(ScriptState*, PassRefPtr<ScriptArguments>);
- void assertCondition(ScriptState*, PassRefPtr<ScriptArguments>, bool condition);
- void count(ScriptState*, PassRefPtr<ScriptArguments>);
- void markTimeline(const String&);
- void profile(const String&);
- void profileEnd(const String&);
- void time(const String&);
- void timeEnd(ScriptState*, const String&);
- void timeStamp(const String&);
- void timeline(ScriptState*, const String&);
- void timelineEnd(ScriptState*, const String&);
- void group(ScriptState*, PassRefPtr<ScriptArguments>);
- void groupCollapsed(ScriptState*, PassRefPtr<ScriptArguments>);
- void groupEnd();
-
- virtual ~ConsoleBase();
-
-protected:
- virtual ExecutionContext* context() = 0;
- virtual void reportMessageToConsole(PassRefPtr<ConsoleMessage>) = 0;
-
-private:
- void internalAddMessage(MessageType, MessageLevel, ScriptState*, PassRefPtr<ScriptArguments>, bool acceptNoArguments = false, bool printTrace = false);
-
- HashCountedSet<String> m_counts;
- HashMap<String, double> m_times;
-};
-
-} // namespace blink
-
-#endif // SKY_ENGINE_CORE_FRAME_CONSOLEBASE_H_
« no previous file with comments | « sky/engine/core/frame/Console.idl ('k') | sky/engine/core/frame/ConsoleBase.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698