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

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

Issue 54053006: Move weborigin/ under platform/ so that it may someday call platform APIs (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Stale refernence to weboriginexport in .gpyi Created 7 years, 1 month 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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 #include "core/page/Settings.h" 79 #include "core/page/Settings.h"
80 #include "core/page/WindowFeatures.h" 80 #include "core/page/WindowFeatures.h"
81 #include "core/platform/ScrollAnimator.h" 81 #include "core/platform/ScrollAnimator.h"
82 #include "core/xml/parser/XMLDocumentParser.h" 82 #include "core/xml/parser/XMLDocumentParser.h"
83 #include "modules/webdatabase/DatabaseManager.h" 83 #include "modules/webdatabase/DatabaseManager.h"
84 #include "platform/Logging.h" 84 #include "platform/Logging.h"
85 #include "platform/UserGestureIndicator.h" 85 #include "platform/UserGestureIndicator.h"
86 #include "platform/geometry/FloatRect.h" 86 #include "platform/geometry/FloatRect.h"
87 #include "platform/network/HTTPParsers.h" 87 #include "platform/network/HTTPParsers.h"
88 #include "platform/network/ResourceRequest.h" 88 #include "platform/network/ResourceRequest.h"
89 #include "weborigin/SecurityOrigin.h" 89 #include "platform/weborigin/SecurityOrigin.h"
90 #include "weborigin/SecurityPolicy.h" 90 #include "platform/weborigin/SecurityPolicy.h"
91 #include "wtf/TemporaryChange.h" 91 #include "wtf/TemporaryChange.h"
92 #include "wtf/text/CString.h" 92 #include "wtf/text/CString.h"
93 #include "wtf/text/WTFString.h" 93 #include "wtf/text/WTFString.h"
94 94
95 namespace WebCore { 95 namespace WebCore {
96 96
97 using namespace HTMLNames; 97 using namespace HTMLNames;
98 98
99 static const char defaultAcceptHeader[] = "text/html,application/xhtml+xml,appli cation/xml;q=0.9,image/webp,*/*;q=0.8"; 99 static const char defaultAcceptHeader[] = "text/html,application/xhtml+xml,appli cation/xml;q=0.9,image/webp,*/*;q=0.8";
100 100
(...skipping 1431 matching lines...) Expand 10 before | Expand all | Expand 10 after
1532 { 1532 {
1533 SandboxFlags flags = m_forcedSandboxFlags; 1533 SandboxFlags flags = m_forcedSandboxFlags;
1534 if (Frame* parentFrame = m_frame->tree().parent()) 1534 if (Frame* parentFrame = m_frame->tree().parent())
1535 flags |= parentFrame->document()->sandboxFlags(); 1535 flags |= parentFrame->document()->sandboxFlags();
1536 if (HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement()) 1536 if (HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement())
1537 flags |= ownerElement->sandboxFlags(); 1537 flags |= ownerElement->sandboxFlags();
1538 return flags; 1538 return flags;
1539 } 1539 }
1540 1540
1541 } // namespace WebCore 1541 } // 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