Title: [131487] trunk/Source/WebCore
- Revision
- 131487
- Author
- [email protected]
- Date
- 2012-10-16 12:45:46 -0700 (Tue, 16 Oct 2012)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (131486 => 131487)
--- trunk/Source/WebCore/ChangeLog 2012-10-16 19:43:53 UTC (rev 131486)
+++ trunk/Source/WebCore/ChangeLog 2012-10-16 19:45:46 UTC (rev 131487)
@@ -1,3 +1,22 @@
+2012-10-16 Nate Chapin <[email protected]>
+
+ 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 <[email protected]>
Rename some AudioNodes
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (131486 => 131487)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2012-10-16 19:43:53 UTC (rev 131486)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2012-10-16 19:45:46 UTC (rev 131487)
@@ -2891,7 +2891,7 @@
if (!page)
return;
- if (!resource->sendResourceLoadCallbacks() || m_documentLoader->haveToldClientAboutLoad(resource->url()))
+ if (!resource->shouldSendResourceLoadCallbacks() || m_documentLoader->haveToldClientAboutLoad(resource->url()))
return;
if (!page->areMemoryCacheClientCallsEnabled()) {
Modified: trunk/Source/WebCore/loader/ResourceLoader.h (131486 => 131487)
--- trunk/Source/WebCore/loader/ResourceLoader.h 2012-10-16 19:43:53 UTC (rev 131486)
+++ trunk/Source/WebCore/loader/ResourceLoader.h 2012-10-16 19:45:46 UTC (rev 131487)
@@ -139,7 +139,7 @@
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; }
Modified: trunk/Source/WebCore/loader/cache/CachedResource.h (131486 => 131487)
--- trunk/Source/WebCore/loader/cache/CachedResource.h 2012-10-16 19:43:53 UTC (rev 131486)
+++ trunk/Source/WebCore/loader/cache/CachedResource.h 2012-10-16 19:45:46 UTC (rev 131487)
@@ -210,7 +210,7 @@
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() { }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
