sendResourceLoadCallbacks() is poorly named
authorjaphet@chromium.org <japhet@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 16 Oct 2012 19:45:46 +0000 (19:45 +0000)
committerjaphet@chromium.org <japhet@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 16 Oct 2012 19:45:46 +0000 (19:45 +0000)
https://bugs.webkit.org/show_bug.cgi?id=99482

Reviewed by Alexey Proskuryakov.

In both CachedResource and ResourceLoader, rename sendResourceLoadCallbacks()
to shouldSendResourceLoadCallbacks() to better indicate that it is a simple getter.

No new tests, simple renaming.

* loader/FrameLoader.cpp:
(WebCore::FrameLoader::loadedResourceFromMemoryCache):
* loader/ResourceLoader.h:
(WebCore::ResourceLoader::shouldSendResourceLoadCallbacks):
* loader/cache/CachedResource.h:
(WebCore::CachedResource::shouldSendResourceLoadCallbacks):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@131487 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/loader/FrameLoader.cpp
Source/WebCore/loader/ResourceLoader.h
Source/WebCore/loader/cache/CachedResource.h

index bd12fb6..747ebdc 100644 (file)
@@ -1,3 +1,22 @@
+2012-10-16  Nate Chapin  <japhet@chromium.org>
+
+        sendResourceLoadCallbacks() is poorly named
+        https://bugs.webkit.org/show_bug.cgi?id=99482
+
+        Reviewed by Alexey Proskuryakov.
+
+        In both CachedResource and ResourceLoader, rename sendResourceLoadCallbacks()
+        to shouldSendResourceLoadCallbacks() to better indicate that it is a simple getter.
+
+        No new tests, simple renaming.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::loadedResourceFromMemoryCache):
+        * loader/ResourceLoader.h:
+        (WebCore::ResourceLoader::shouldSendResourceLoadCallbacks):
+        * loader/cache/CachedResource.h:
+        (WebCore::CachedResource::shouldSendResourceLoadCallbacks):
+
 2012-10-16  Chris Rogers  <crogers@google.com>
 
         Rename some AudioNodes
index 2529158..8ab3d89 100644 (file)
@@ -2891,7 +2891,7 @@ void FrameLoader::loadedResourceFromMemoryCache(CachedResource* resource)
     if (!page)
         return;
 
-    if (!resource->sendResourceLoadCallbacks() || m_documentLoader->haveToldClientAboutLoad(resource->url()))
+    if (!resource->shouldSendResourceLoadCallbacks() || m_documentLoader->haveToldClientAboutLoad(resource->url()))
         return;
 
     if (!page->areMemoryCacheClientCallsEnabled()) {
index 29616a9..32e82fb 100644 (file)
@@ -139,7 +139,7 @@ namespace WebCore {
 
         const KURL& url() const { return m_request.url(); } 
         ResourceHandle* handle() const { return m_handle.get(); }
-        bool sendResourceLoadCallbacks() const { return m_options.sendLoadCallbacks == SendCallbacks; }
+        bool shouldSendResourceLoadCallbacks() const { return m_options.sendLoadCallbacks == SendCallbacks; }
 
         bool reachedTerminalState() const { return m_reachedTerminalState; }
 
index eb31d9d..9c5d365 100644 (file)
@@ -210,7 +210,7 @@ public:
     bool errorOccurred() const { return (m_status == LoadError || m_status == DecodeError); }
     bool loadFailedOrCanceled() { return m_status == Canceled || m_status == LoadError; }
 
-    bool sendResourceLoadCallbacks() const { return m_options.sendLoadCallbacks == SendCallbacks; }
+    bool shouldSendResourceLoadCallbacks() const { return m_options.sendLoadCallbacks == SendCallbacks; }
     
     virtual void destroyDecodedData() { }