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

Side by Side Diff: third_party/WebKit/Source/core/loader/FrameLoader.cpp

Issue 2774823002: Remove FrameHost class (Closed)
Patch Set: Rebase Created 3 years, 8 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) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
3 * reserved. 3 * reserved.
4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
5 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 5 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
6 * (http://www.torchmobile.com/) 6 * (http://www.torchmobile.com/)
7 * Copyright (C) 2008 Alp Toker <alp@atoker.com> 7 * Copyright (C) 2008 Alp Toker <alp@atoker.com>
8 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 8 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
9 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> 9 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
10 * Copyright (C) 2011 Google Inc. All rights reserved. 10 * Copyright (C) 2011 Google Inc. All rights reserved.
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #include "core/HTMLNames.h" 43 #include "core/HTMLNames.h"
44 #include "core/dom/Document.h" 44 #include "core/dom/Document.h"
45 #include "core/dom/Element.h" 45 #include "core/dom/Element.h"
46 #include "core/dom/TaskRunnerHelper.h" 46 #include "core/dom/TaskRunnerHelper.h"
47 #include "core/dom/ViewportDescription.h" 47 #include "core/dom/ViewportDescription.h"
48 #include "core/editing/Editor.h" 48 #include "core/editing/Editor.h"
49 #include "core/events/GestureEvent.h" 49 #include "core/events/GestureEvent.h"
50 #include "core/events/KeyboardEvent.h" 50 #include "core/events/KeyboardEvent.h"
51 #include "core/events/MouseEvent.h" 51 #include "core/events/MouseEvent.h"
52 #include "core/events/PageTransitionEvent.h" 52 #include "core/events/PageTransitionEvent.h"
53 #include "core/frame/FrameHost.h"
54 #include "core/frame/FrameView.h" 53 #include "core/frame/FrameView.h"
55 #include "core/frame/LocalDOMWindow.h" 54 #include "core/frame/LocalDOMWindow.h"
56 #include "core/frame/LocalFrame.h" 55 #include "core/frame/LocalFrame.h"
57 #include "core/frame/LocalFrameClient.h" 56 #include "core/frame/LocalFrameClient.h"
58 #include "core/frame/Settings.h" 57 #include "core/frame/Settings.h"
59 #include "core/frame/VisualViewport.h" 58 #include "core/frame/VisualViewport.h"
60 #include "core/frame/csp/ContentSecurityPolicy.h" 59 #include "core/frame/csp/ContentSecurityPolicy.h"
61 #include "core/html/HTMLFormElement.h" 60 #include "core/html/HTMLFormElement.h"
62 #include "core/html/HTMLFrameOwnerElement.h" 61 #include "core/html/HTMLFrameOwnerElement.h"
63 #include "core/input/EventHandler.h" 62 #include "core/input/EventHandler.h"
(...skipping 604 matching lines...) Expand 10 before | Expand all | Expand 10 after
668 return client() ? client()->opener() : 0; 667 return client() ? client()->opener() : 0;
669 } 668 }
670 669
671 void FrameLoader::setOpener(LocalFrame* opener) { 670 void FrameLoader::setOpener(LocalFrame* opener) {
672 // If the frame is already detached, the opener has already been cleared. 671 // If the frame is already detached, the opener has already been cleared.
673 if (client()) 672 if (client())
674 client()->setOpener(opener); 673 client()->setOpener(opener);
675 } 674 }
676 675
677 bool FrameLoader::allowPlugins(ReasonForCallingAllowPlugins reason) { 676 bool FrameLoader::allowPlugins(ReasonForCallingAllowPlugins reason) {
678 // With Oilpan, a FrameLoader might be accessed after the FrameHost has been 677 // With Oilpan, a FrameLoader might be accessed after the Page has been
679 // detached. FrameClient will not be accessible, so bail early. 678 // detached. FrameClient will not be accessible, so bail early.
680 if (!client()) 679 if (!client())
681 return false; 680 return false;
682 Settings* settings = m_frame->settings(); 681 Settings* settings = m_frame->settings();
683 bool allowed = 682 bool allowed =
684 client()->allowPlugins(settings && settings->getPluginsEnabled()); 683 client()->allowPlugins(settings && settings->getPluginsEnabled());
685 if (!allowed && reason == AboutToInstantiatePlugin) 684 if (!allowed && reason == AboutToInstantiatePlugin)
686 client()->didNotAllowPlugins(); 685 client()->didNotAllowPlugins();
687 return allowed; 686 return allowed;
688 } 687 }
(...skipping 1212 matching lines...) Expand 10 before | Expand all | Expand 10 after
1901 frameLoadRequest.clientRedirect()); 1900 frameLoadRequest.clientRedirect());
1902 1901
1903 loader->setLoadType(loadType); 1902 loader->setLoadType(loadType);
1904 loader->setNavigationType(navigationType); 1903 loader->setNavigationType(navigationType);
1905 loader->setReplacesCurrentHistoryItem(loadType == 1904 loader->setReplacesCurrentHistoryItem(loadType ==
1906 FrameLoadTypeReplaceCurrentItem); 1905 FrameLoadTypeReplaceCurrentItem);
1907 return loader; 1906 return loader;
1908 } 1907 }
1909 1908
1910 } // namespace blink 1909 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698