diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2012-09-18 15:53:33 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-09-18 15:53:33 +0200 |
commit | 6bbb7fbbac94d0f511a7bd0cbd50854ab643bfb2 (patch) | |
tree | d9c68d1cca0b3e352f1e438561f3e504e641a08f /Source/WebCore/loader/ImageLoader.h | |
parent | d0424a769059c84ae20beb3c217812792ea6726b (diff) | |
download | qtwebkit-6bbb7fbbac94d0f511a7bd0cbd50854ab643bfb2.tar.gz |
Imported WebKit commit c7503cef7ecb236730d1309676ab9fc723fd061d (http://svn.webkit.org/repository/webkit/trunk@128886)
New snapshot with various build fixes
Diffstat (limited to 'Source/WebCore/loader/ImageLoader.h')
-rw-r--r-- | Source/WebCore/loader/ImageLoader.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/loader/ImageLoader.h b/Source/WebCore/loader/ImageLoader.h index 796d71802..910744416 100644 --- a/Source/WebCore/loader/ImageLoader.h +++ b/Source/WebCore/loader/ImageLoader.h @@ -66,7 +66,7 @@ public: void setLoadManually(bool loadManually) { m_loadManually = loadManually; } bool hasPendingBeforeLoadEvent() const { return m_hasPendingBeforeLoadEvent; } - bool hasPendingLoadEvent() const { return m_hasPendingLoadEvent; } + bool hasPendingActivity() const { return m_hasPendingLoadEvent || m_hasPendingErrorEvent; } void dispatchPendingEvent(ImageEventSender*); |