Optimizing variable use by reducing scope

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 21 matching lines @@
 #include "core/events/EventListener.h"
 #include "core/frame/LocalFrame.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/loader/FrameLoader.h"
 
 namespace blink {
 
 ApplicationCache::ApplicationCache(LocalFrame* frame)
     : DOMWindowProperty(frame)
 {
-    ApplicationCacheHost* cacheHost = applicationCacheHost();
-    if (cacheHost)
+    if (ApplicationCacheHost* cacheHost = applicationCacheHost())
         cacheHost->setApplicationCache(this);
 }
 
 DEFINE_TRACE(ApplicationCache)
 {
     EventTargetWithInlineData::trace(visitor);
     DOMWindowProperty::trace(visitor);
 }
 
 void ApplicationCache::willDestroyGlobalObjectInFrame()
 {
     if (ApplicationCacheHost* cacheHost = applicationCacheHost())
         cacheHost->setApplicationCache(0);
     DOMWindowProperty::willDestroyGlobalObjectInFrame();
 }
 
 ApplicationCacheHost* ApplicationCache::applicationCacheHost() const
 {
     if (!m_frame || !m_frame->loader().documentLoader())
         return 0;
     return m_frame->loader().documentLoader()->applicationCacheHost();
 }
 
 unsigned short ApplicationCache::status() const
 {
-    ApplicationCacheHost* cacheHost = applicationCacheHost();
-    if (!cacheHost)
-        return ApplicationCacheHost::UNCACHED;
-    return cacheHost->status();
+    if (ApplicationCacheHost* cacheHost = applicationCacheHost())
+        return cacheHost->status();
+    return ApplicationCacheHost::UNCACHED;
 }
 
 void ApplicationCache::update(ExceptionState& exceptionState)
 {
     ApplicationCacheHost* cacheHost = applicationCacheHost();
     if (!cacheHost || !cacheHost->update())
         exceptionState.throwDOMException(InvalidStateError, "there is no application cache to update.");
 }
 
 void ApplicationCache::swapCache(ExceptionState& exceptionState)
 {
     ApplicationCacheHost* cacheHost = applicationCacheHost();
     if (!cacheHost || !cacheHost->swapCache())
         exceptionState.throwDOMException(InvalidStateError, "there is no newer application cache to swap to.");
 }
 
 void ApplicationCache::abort()
 {
-    ApplicationCacheHost* cacheHost = applicationCacheHost();
-    if (cacheHost)
+    if (ApplicationCacheHost* cacheHost = applicationCacheHost())
         cacheHost->abort();
 }
 
 const AtomicString& ApplicationCache::interfaceName() const
 {
     return EventTargetNames::ApplicationCache;
 }
 
 ExecutionContext* ApplicationCache::executionContext() const
 {
@@ skipping 20 matching lines @@
     case ApplicationCacheHost::CACHED_EVENT:
         return EventTypeNames::cached;
     case ApplicationCacheHost::OBSOLETE_EVENT:
         return EventTypeNames::obsolete;
     }
     ASSERT_NOT_REACHED();
     return EventTypeNames::error;
 }
 
 } // namespace blink