OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
5 * 2000 Simon Hausmann <hausmann@kde.org> | 5 * 2000 Simon Hausmann <hausmann@kde.org> |
6 * 2000 Stefan Schimanski <1Stein@gmx.de> | 6 * 2000 Stefan Schimanski <1Stein@gmx.de> |
7 * 2001 George Staikos <staikos@kde.org> | 7 * 2001 George Staikos <staikos@kde.org> |
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All | 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All |
9 * rights reserved. | 9 * rights reserved. |
10 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> | 10 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
47 #include "core/frame/FrameConsole.h" | 47 #include "core/frame/FrameConsole.h" |
48 #include "core/frame/FrameHost.h" | 48 #include "core/frame/FrameHost.h" |
49 #include "core/frame/FrameView.h" | 49 #include "core/frame/FrameView.h" |
50 #include "core/frame/LocalDOMWindow.h" | 50 #include "core/frame/LocalDOMWindow.h" |
51 #include "core/frame/PerformanceMonitor.h" | 51 #include "core/frame/PerformanceMonitor.h" |
52 #include "core/frame/Settings.h" | 52 #include "core/frame/Settings.h" |
53 #include "core/frame/VisualViewport.h" | 53 #include "core/frame/VisualViewport.h" |
54 #include "core/html/HTMLFrameElementBase.h" | 54 #include "core/html/HTMLFrameElementBase.h" |
55 #include "core/html/HTMLPlugInElement.h" | 55 #include "core/html/HTMLPlugInElement.h" |
56 #include "core/input/EventHandler.h" | 56 #include "core/input/EventHandler.h" |
| 57 #include "core/inspector/ConsoleMessage.h" |
57 #include "core/inspector/InspectorInstrumentation.h" | 58 #include "core/inspector/InspectorInstrumentation.h" |
58 #include "core/layout/HitTestResult.h" | 59 #include "core/layout/HitTestResult.h" |
59 #include "core/layout/LayoutView.h" | 60 #include "core/layout/LayoutView.h" |
60 #include "core/layout/api/LayoutPartItem.h" | 61 #include "core/layout/api/LayoutPartItem.h" |
61 #include "core/layout/api/LayoutViewItem.h" | 62 #include "core/layout/api/LayoutViewItem.h" |
62 #include "core/layout/compositing/PaintLayerCompositor.h" | 63 #include "core/layout/compositing/PaintLayerCompositor.h" |
63 #include "core/loader/FrameLoadRequest.h" | 64 #include "core/loader/FrameLoadRequest.h" |
64 #include "core/loader/FrameLoaderClient.h" | 65 #include "core/loader/FrameLoaderClient.h" |
65 #include "core/loader/NavigationScheduler.h" | 66 #include "core/loader/NavigationScheduler.h" |
66 #include "core/page/ChromeClient.h" | 67 #include "core/page/ChromeClient.h" |
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
467 targetFrame.securityContext()->getSecurityOrigin()->toString() + | 468 targetFrame.securityContext()->getSecurityOrigin()->toString() + |
468 "'"; | 469 "'"; |
469 String message = | 470 String message = |
470 "Unsafe JavaScript attempt to initiate navigation for frame " + | 471 "Unsafe JavaScript attempt to initiate navigation for frame " + |
471 targetFrameDescription + " from frame with URL '" + | 472 targetFrameDescription + " from frame with URL '" + |
472 document()->url().getString() + "'. " + reason + "\n"; | 473 document()->url().getString() + "'. " + reason + "\n"; |
473 | 474 |
474 localDOMWindow()->printErrorMessage(message); | 475 localDOMWindow()->printErrorMessage(message); |
475 } | 476 } |
476 | 477 |
| 478 void LocalFrame::printNavigationWarning(const String& message) { |
| 479 m_console->addMessage( |
| 480 ConsoleMessage::create(JSMessageSource, WarningMessageLevel, message)); |
| 481 } |
| 482 |
477 WindowProxyManager* LocalFrame::getWindowProxyManager() const { | 483 WindowProxyManager* LocalFrame::getWindowProxyManager() const { |
478 return m_script->getWindowProxyManager(); | 484 return m_script->getWindowProxyManager(); |
479 } | 485 } |
480 | 486 |
481 bool LocalFrame::shouldClose() { | 487 bool LocalFrame::shouldClose() { |
482 // TODO(dcheng): This should be fixed to dispatch beforeunload events to | 488 // TODO(dcheng): This should be fixed to dispatch beforeunload events to |
483 // both local and remote frames. | 489 // both local and remote frames. |
484 return m_loader.shouldClose(); | 490 return m_loader.shouldClose(); |
485 } | 491 } |
486 | 492 |
(...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
925 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 931 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
926 m_frame->client()->frameBlameContext()->Enter(); | 932 m_frame->client()->frameBlameContext()->Enter(); |
927 } | 933 } |
928 | 934 |
929 ScopedFrameBlamer::~ScopedFrameBlamer() { | 935 ScopedFrameBlamer::~ScopedFrameBlamer() { |
930 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 936 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
931 m_frame->client()->frameBlameContext()->Leave(); | 937 m_frame->client()->frameBlameContext()->Leave(); |
932 } | 938 } |
933 | 939 |
934 } // namespace blink | 940 } // namespace blink |
OLD | NEW |