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

Side by Side Diff: Source/core/loader/cache/CachedResourceLoader.cpp

Issue 14323004: Make Frame's ScriptController an OwnPtr and remove the #include (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix Created 7 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/loader/SubframeLoader.cpp ('k') | Source/core/page/DOMWindow.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) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) 3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
5 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/ 6 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
7 7
8 This library is free software; you can redistribute it and/or 8 This library is free software; you can redistribute it and/or
9 modify it under the terms of the GNU Library General Public 9 modify it under the terms of the GNU Library General Public
10 License as published by the Free Software Foundation; either 10 License as published by the Free Software Foundation; either
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #include "DocumentLoader.h" 43 #include "DocumentLoader.h"
44 #include "Frame.h" 44 #include "Frame.h"
45 #include "FrameLoader.h" 45 #include "FrameLoader.h"
46 #include "FrameLoaderClient.h" 46 #include "FrameLoaderClient.h"
47 #include "HTMLElement.h" 47 #include "HTMLElement.h"
48 #include "HTMLFrameOwnerElement.h" 48 #include "HTMLFrameOwnerElement.h"
49 #include "Logging.h" 49 #include "Logging.h"
50 #include "MemoryCache.h" 50 #include "MemoryCache.h"
51 #include "Performance.h" 51 #include "Performance.h"
52 #include "PingLoader.h" 52 #include "PingLoader.h"
53 #include "ScriptController.h"
53 #include "SecurityOrigin.h" 54 #include "SecurityOrigin.h"
54 #include "Settings.h" 55 #include "Settings.h"
55 #include <wtf/MemoryInstrumentationHashMap.h> 56 #include <wtf/MemoryInstrumentationHashMap.h>
56 #include <wtf/MemoryInstrumentationHashSet.h> 57 #include <wtf/MemoryInstrumentationHashSet.h>
57 #include <wtf/MemoryInstrumentationListHashSet.h> 58 #include <wtf/MemoryInstrumentationListHashSet.h>
58 #include <wtf/UnusedParam.h> 59 #include <wtf/UnusedParam.h>
59 #include <wtf/text/CString.h> 60 #include <wtf/text/CString.h>
60 #include <wtf/text/WTFString.h> 61 #include <wtf/text/WTFString.h>
61 62
62 #include "CachedTextTrack.h" 63 #include "CachedTextTrack.h"
(...skipping 863 matching lines...) Expand 10 before | Expand all | Expand 10 after
926 info.ignoreMember(m_initiatorMap); 927 info.ignoreMember(m_initiatorMap);
927 } 928 }
928 929
929 const ResourceLoaderOptions& CachedResourceLoader::defaultCachedResourceOptions( ) 930 const ResourceLoaderOptions& CachedResourceLoader::defaultCachedResourceOptions( )
930 { 931 {
931 static ResourceLoaderOptions options(SendCallbacks, SniffContent, BufferData , AllowStoredCredentials, AskClientForCrossOriginCredentials, DoSecurityCheck); 932 static ResourceLoaderOptions options(SendCallbacks, SniffContent, BufferData , AllowStoredCredentials, AskClientForCrossOriginCredentials, DoSecurityCheck);
932 return options; 933 return options;
933 } 934 }
934 935
935 } 936 }
OLDNEW
« no previous file with comments | « Source/core/loader/SubframeLoader.cpp ('k') | Source/core/page/DOMWindow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698