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

Unified Diff: sky/engine/core/frame/Console.cpp

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.h ('k') | sky/engine/core/frame/Console.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/frame/Console.cpp
diff --git a/sky/engine/core/frame/Console.cpp b/sky/engine/core/frame/Console.cpp
deleted file mode 100644
index c4ab44062105561f0536d5f0b5e655fe8ba48bbb..0000000000000000000000000000000000000000
--- a/sky/engine/core/frame/Console.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2007 Apple 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.
- */
-
-#include "sky/engine/config.h"
-#include "sky/engine/core/frame/Console.h"
-
-#include "sky/engine/bindings/core/v8/ScriptCallStackFactory.h"
-#include "sky/engine/core/dom/Document.h"
-#include "sky/engine/core/frame/ConsoleTypes.h"
-#include "sky/engine/core/frame/FrameConsole.h"
-#include "sky/engine/core/frame/FrameHost.h"
-#include "sky/engine/core/frame/LocalFrame.h"
-#include "sky/engine/core/inspector/ConsoleAPITypes.h"
-#include "sky/engine/core/inspector/ConsoleMessage.h"
-#include "sky/engine/core/inspector/ScriptArguments.h"
-#include "sky/engine/core/inspector/ScriptCallStack.h"
-#include "sky/engine/core/page/ChromeClient.h"
-#include "sky/engine/platform/TraceEvent.h"
-#include "sky/engine/wtf/text/CString.h"
-#include "sky/engine/wtf/text/WTFString.h"
-
-namespace blink {
-
-Console::Console(LocalFrame* frame)
- : DOMWindowProperty(frame)
-{
-}
-
-Console::~Console()
-{
-}
-
-ExecutionContext* Console::context()
-{
- if (!m_frame)
- return 0;
- return m_frame->document();
-}
-
-void Console::reportMessageToConsole(PassRefPtr<ConsoleMessage> consoleMessage)
-{
- if (!m_frame)
- return;
-
- m_frame->console().addMessage(consoleMessage);
-}
-
-} // namespace blink
« no previous file with comments | « sky/engine/core/frame/Console.h ('k') | sky/engine/core/frame/Console.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698