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

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

Issue 26558004: Revert 158219 "Move dom/*Event* to events to match the DOM vs. E..." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/1651/
Patch Set: Created 7 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/loader/FrameLoadRequest.h ('k') | Source/core/loader/ImageLoader.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com>
6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> 7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
8 * Copyright (C) 2011 Google Inc. All rights reserved. 8 * Copyright (C) 2011 Google Inc. All rights reserved.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
(...skipping 23 matching lines...) Expand all
34 34
35 #include "config.h" 35 #include "config.h"
36 #include "core/loader/FrameLoader.h" 36 #include "core/loader/FrameLoader.h"
37 37
38 #include "HTMLNames.h" 38 #include "HTMLNames.h"
39 #include "bindings/v8/DOMWrapperWorld.h" 39 #include "bindings/v8/DOMWrapperWorld.h"
40 #include "bindings/v8/ScriptController.h" 40 #include "bindings/v8/ScriptController.h"
41 #include "bindings/v8/SerializedScriptValue.h" 41 #include "bindings/v8/SerializedScriptValue.h"
42 #include "core/dom/Document.h" 42 #include "core/dom/Document.h"
43 #include "core/dom/Element.h" 43 #include "core/dom/Element.h"
44 #include "core/events/Event.h" 44 #include "core/dom/Event.h"
45 #include "core/events/EventNames.h" 45 #include "core/dom/EventNames.h"
46 #include "core/events/PageTransitionEvent.h" 46 #include "core/dom/PageTransitionEvent.h"
47 #include "core/editing/Editor.h" 47 #include "core/editing/Editor.h"
48 #include "core/fetch/FetchContext.h" 48 #include "core/fetch/FetchContext.h"
49 #include "core/fetch/ResourceFetcher.h" 49 #include "core/fetch/ResourceFetcher.h"
50 #include "core/fetch/ResourceLoader.h" 50 #include "core/fetch/ResourceLoader.h"
51 #include "core/history/BackForwardController.h" 51 #include "core/history/BackForwardController.h"
52 #include "core/history/HistoryItem.h" 52 #include "core/history/HistoryItem.h"
53 #include "core/html/HTMLFormElement.h" 53 #include "core/html/HTMLFormElement.h"
54 #include "core/html/HTMLFrameOwnerElement.h" 54 #include "core/html/HTMLFrameOwnerElement.h"
55 #include "core/html/parser/HTMLParserIdioms.h" 55 #include "core/html/parser/HTMLParserIdioms.h"
56 #include "core/inspector/InspectorController.h" 56 #include "core/inspector/InspectorController.h"
(...skipping 1553 matching lines...) Expand 10 before | Expand all | Expand 10 after
1610 { 1610 {
1611 SandboxFlags flags = m_forcedSandboxFlags; 1611 SandboxFlags flags = m_forcedSandboxFlags;
1612 if (Frame* parentFrame = m_frame->tree()->parent()) 1612 if (Frame* parentFrame = m_frame->tree()->parent())
1613 flags |= parentFrame->document()->sandboxFlags(); 1613 flags |= parentFrame->document()->sandboxFlags();
1614 if (HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement()) 1614 if (HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement())
1615 flags |= ownerElement->sandboxFlags(); 1615 flags |= ownerElement->sandboxFlags();
1616 return flags; 1616 return flags;
1617 } 1617 }
1618 1618
1619 } // namespace WebCore 1619 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/loader/FrameLoadRequest.h ('k') | Source/core/loader/ImageLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698