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

Side by Side Diff: Source/core/loader/appcache/ApplicationCache.cpp

Issue 31063004: Have Frame::loader() return a reference (Closed) Base URL: svn://svn.chromium.org/blink/trunk
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/ProgressTracker.cpp ('k') | Source/core/page/CreateWindow.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) 2008, 2009 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2008, 2009 Apple Inc. All Rights Reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 50
51 void ApplicationCache::willDestroyGlobalObjectInFrame() 51 void ApplicationCache::willDestroyGlobalObjectInFrame()
52 { 52 {
53 if (ApplicationCacheHost* cacheHost = applicationCacheHost()) 53 if (ApplicationCacheHost* cacheHost = applicationCacheHost())
54 cacheHost->setApplicationCache(0); 54 cacheHost->setApplicationCache(0);
55 DOMWindowProperty::willDestroyGlobalObjectInFrame(); 55 DOMWindowProperty::willDestroyGlobalObjectInFrame();
56 } 56 }
57 57
58 ApplicationCacheHost* ApplicationCache::applicationCacheHost() const 58 ApplicationCacheHost* ApplicationCache::applicationCacheHost() const
59 { 59 {
60 if (!m_frame || !m_frame->loader()->documentLoader()) 60 if (!m_frame || !m_frame->loader().documentLoader())
61 return 0; 61 return 0;
62 return m_frame->loader()->documentLoader()->applicationCacheHost(); 62 return m_frame->loader().documentLoader()->applicationCacheHost();
63 } 63 }
64 64
65 unsigned short ApplicationCache::status() const 65 unsigned short ApplicationCache::status() const
66 { 66 {
67 ApplicationCacheHost* cacheHost = applicationCacheHost(); 67 ApplicationCacheHost* cacheHost = applicationCacheHost();
68 if (!cacheHost) 68 if (!cacheHost)
69 return ApplicationCacheHost::UNCACHED; 69 return ApplicationCacheHost::UNCACHED;
70 return cacheHost->status(); 70 return cacheHost->status();
71 } 71 }
72 72
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 case ApplicationCacheHost::CACHED_EVENT: 121 case ApplicationCacheHost::CACHED_EVENT:
122 return EventTypeNames::cached; 122 return EventTypeNames::cached;
123 case ApplicationCacheHost::OBSOLETE_EVENT: 123 case ApplicationCacheHost::OBSOLETE_EVENT:
124 return EventTypeNames::obsolete; 124 return EventTypeNames::obsolete;
125 } 125 }
126 ASSERT_NOT_REACHED(); 126 ASSERT_NOT_REACHED();
127 return EventTypeNames::error; 127 return EventTypeNames::error;
128 } 128 }
129 129
130 } // namespace WebCore 130 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/loader/ProgressTracker.cpp ('k') | Source/core/page/CreateWindow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698