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/fetch/Resource.cpp

Issue 1482683002: Trial: build trunk with Oilpan everywhere. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: have RemoteDOMWindow keep a weak ref back to its RemoteFrame Created 5 years 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) 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) 2006 Samuel Weinig (sam.weinig@gmail.com) 5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
6 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 6 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
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 23 matching lines...) Expand all
34 #include "core/fetch/ResourceLoader.h" 34 #include "core/fetch/ResourceLoader.h"
35 #include "core/fetch/ResourcePtr.h" 35 #include "core/fetch/ResourcePtr.h"
36 #include "core/inspector/InspectorInstrumentation.h" 36 #include "core/inspector/InspectorInstrumentation.h"
37 #include "platform/Logging.h" 37 #include "platform/Logging.h"
38 #include "platform/SharedBuffer.h" 38 #include "platform/SharedBuffer.h"
39 #include "platform/TraceEvent.h" 39 #include "platform/TraceEvent.h"
40 #include "platform/weborigin/KURL.h" 40 #include "platform/weborigin/KURL.h"
41 #include "public/platform/Platform.h" 41 #include "public/platform/Platform.h"
42 #include "public/platform/WebProcessMemoryDump.h" 42 #include "public/platform/WebProcessMemoryDump.h"
43 #include "wtf/CurrentTime.h" 43 #include "wtf/CurrentTime.h"
44 #include "wtf/LeakAnnotations.h"
44 #include "wtf/MathExtras.h" 45 #include "wtf/MathExtras.h"
45 #include "wtf/StdLibExtras.h" 46 #include "wtf/StdLibExtras.h"
46 #include "wtf/Vector.h" 47 #include "wtf/Vector.h"
47 #include "wtf/text/CString.h" 48 #include "wtf/text/CString.h"
48 49
49 using namespace WTF; 50 using namespace WTF;
50 51
51 namespace blink { 52 namespace blink {
52 53
53 // These response headers are not copied from a revalidated response to the 54 // These response headers are not copied from a revalidated response to the
(...skipping 936 matching lines...) Expand 10 before | Expand all | Expand 10 after
990 if (nextPriority.visibility == ResourcePriority::NotVisible) 991 if (nextPriority.visibility == ResourcePriority::NotVisible)
991 continue; 992 continue;
992 priority.visibility = ResourcePriority::Visible; 993 priority.visibility = ResourcePriority::Visible;
993 priority.intraPriorityValue += nextPriority.intraPriorityValue; 994 priority.intraPriorityValue += nextPriority.intraPriorityValue;
994 } 995 }
995 return priority; 996 return priority;
996 } 997 }
997 998
998 Resource::ResourceCallback* Resource::ResourceCallback::callbackHandler() 999 Resource::ResourceCallback* Resource::ResourceCallback::callbackHandler()
999 { 1000 {
1001 WTF_ANNOTATE_SCOPED_MEMORY_LEAK;
1000 DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<ResourceCallback>, callbackHandle r, (adoptPtrWillBeNoop(new ResourceCallback))); 1002 DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<ResourceCallback>, callbackHandle r, (adoptPtrWillBeNoop(new ResourceCallback)));
1001 return callbackHandler.get(); 1003 return callbackHandler.get();
1002 } 1004 }
1003 1005
1004 DEFINE_TRACE(Resource::ResourceCallback) 1006 DEFINE_TRACE(Resource::ResourceCallback)
1005 { 1007 {
1006 #if ENABLE(OILPAN) 1008 #if ENABLE(OILPAN)
1007 visitor->trace(m_resourcesWithPendingClients); 1009 visitor->trace(m_resourcesWithPendingClients);
1008 #endif 1010 #endif
1009 } 1011 }
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
1157 return "ImportResource"; 1159 return "ImportResource";
1158 case Resource::Media: 1160 case Resource::Media:
1159 return "Media"; 1161 return "Media";
1160 } 1162 }
1161 ASSERT_NOT_REACHED(); 1163 ASSERT_NOT_REACHED();
1162 return "Unknown"; 1164 return "Unknown";
1163 } 1165 }
1164 #endif // !LOG_DISABLED 1166 #endif // !LOG_DISABLED
1165 1167
1166 } // namespace blink 1168 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698