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

Side by Side Diff: sky/engine/core/fetch/ResourceFetcher.cpp

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « sky/engine/core/events/UIEvent.idl ('k') | sky/engine/core/frame/Console.h » ('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 11 matching lines...) Expand all
22 22
23 This class provides all functionality needed for loading images, style sheet s and html 23 This class provides all functionality needed for loading images, style sheet s and html
24 pages from the web. It has a memory cache for these objects. 24 pages from the web. It has a memory cache for these objects.
25 */ 25 */
26 26
27 #include "sky/engine/config.h" 27 #include "sky/engine/config.h"
28 #include "sky/engine/core/fetch/ResourceFetcher.h" 28 #include "sky/engine/core/fetch/ResourceFetcher.h"
29 29
30 #include "gen/sky/core/FetchInitiatorTypeNames.h" 30 #include "gen/sky/core/FetchInitiatorTypeNames.h"
31 #include "gen/sky/platform/RuntimeEnabledFeatures.h" 31 #include "gen/sky/platform/RuntimeEnabledFeatures.h"
32 #include "sky/engine/bindings/core/v8/ScriptController.h"
33 #include "sky/engine/core/dom/Document.h" 32 #include "sky/engine/core/dom/Document.h"
34 #include "sky/engine/core/fetch/FetchContext.h" 33 #include "sky/engine/core/fetch/FetchContext.h"
35 #include "sky/engine/core/fetch/FontResource.h" 34 #include "sky/engine/core/fetch/FontResource.h"
36 #include "sky/engine/core/fetch/ImageResource.h" 35 #include "sky/engine/core/fetch/ImageResource.h"
37 #include "sky/engine/core/fetch/MemoryCache.h" 36 #include "sky/engine/core/fetch/MemoryCache.h"
38 #include "sky/engine/core/fetch/RawResource.h" 37 #include "sky/engine/core/fetch/RawResource.h"
39 #include "sky/engine/core/fetch/ResourceLoader.h" 38 #include "sky/engine/core/fetch/ResourceLoader.h"
40 #include "sky/engine/core/fetch/ResourceLoaderSet.h" 39 #include "sky/engine/core/fetch/ResourceLoaderSet.h"
41 #include "sky/engine/core/frame/LocalDOMWindow.h" 40 #include "sky/engine/core/frame/LocalDOMWindow.h"
42 #include "sky/engine/core/frame/LocalFrame.h" 41 #include "sky/engine/core/frame/LocalFrame.h"
(...skipping 718 matching lines...) Expand 10 before | Expand all | Expand 10 after
761 case Revalidate: 760 case Revalidate:
762 ++m_revalidateCount; 761 ++m_revalidateCount;
763 return; 762 return;
764 case Use: 763 case Use:
765 ++m_useCount; 764 ++m_useCount;
766 return; 765 return;
767 } 766 }
768 } 767 }
769 768
770 } 769 }
OLDNEW
« no previous file with comments | « sky/engine/core/events/UIEvent.idl ('k') | sky/engine/core/frame/Console.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698