Move Location to DOMWindow

Source/core/loader/appcache/ApplicationCache.cpp

 /*
  * Copyright (C) 2008, 2009 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 41 matching lines @@
 
 void ApplicationCache::willDestroyGlobalObjectInFrame()
 {
     if (ApplicationCacheHost* cacheHost = applicationCacheHost())
         cacheHost->setApplicationCache(0);
     DOMWindowProperty::willDestroyGlobalObjectInFrame();
 }
 
 ApplicationCacheHost* ApplicationCache::applicationCacheHost() const
 {
-    if (!m_frame || !m_frame->loader().documentLoader())
+    if (!localFrame() || !localFrame()->loader().documentLoader())
         return 0;
-    return m_frame->loader().documentLoader()->applicationCacheHost();
+    return localFrame()->loader().documentLoader()->applicationCacheHost();
 }
 
 unsigned short ApplicationCache::status() const
 {
     ApplicationCacheHost* cacheHost = applicationCacheHost();
     if (!cacheHost)
         return ApplicationCacheHost::UNCACHED;
     return cacheHost->status();
 }
 
@@ skipping 18 matching lines @@
         cacheHost->abort();
 }
 
 const AtomicString& ApplicationCache::interfaceName() const
 {
     return EventTargetNames::ApplicationCache;
 }
 
 ExecutionContext* ApplicationCache::executionContext() const
 {
-    if (m_frame)
-        return m_frame->document();
+    if (localFrame())
+        return localFrame()->document();
     return 0;
 }
 
 const AtomicString& ApplicationCache::toEventType(ApplicationCacheHost::EventID id)
 {
     switch (id) {
     case ApplicationCacheHost::CHECKING_EVENT:
         return EventTypeNames::checking;
     case ApplicationCacheHost::ERROR_EVENT:
         return EventTypeNames::error;
     case ApplicationCacheHost::NOUPDATE_EVENT:
         return EventTypeNames::noupdate;
     case ApplicationCacheHost::DOWNLOADING_EVENT:
         return EventTypeNames::downloading;
     case ApplicationCacheHost::PROGRESS_EVENT:
         return EventTypeNames::progress;
     case ApplicationCacheHost::UPDATEREADY_EVENT:
         return EventTypeNames::updateready;
     case ApplicationCacheHost::CACHED_EVENT:
         return EventTypeNames::cached;
     case ApplicationCacheHost::OBSOLETE_EVENT:
         return EventTypeNames::obsolete;
     }
     ASSERT_NOT_REACHED();
     return EventTypeNames::error;
 }
 
 } // namespace blink