diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-10 10:35:58 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-10 10:35:58 +0100 |
| commit | 38ad9239977ac6e66573f5508ce2f030c576093c (patch) | |
| tree | 9599b8559ade3047253380d0d3898478d6a4f59d | |
| parent | 379f64401d285e4047e30557513a2740d6860157 (diff) | |
| parent | 367eb49cfd0bf5e04040951b23cfbbe84738fef1 (diff) | |
| download | qtwebkit-38ad9239977ac6e66573f5508ce2f030c576093c.tar.gz | |
Merge remote-tracking branch 'origin/5.4.1' into 5.4
Change-Id: I39ebf7fb2c12b6afa986a20380cea309f0a1bbee
| -rw-r--r-- | Source/WebCore/html/ImageDocument.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/html/ImageDocument.cpp b/Source/WebCore/html/ImageDocument.cpp index 444bdb76a..7d9bcc589 100644 --- a/Source/WebCore/html/ImageDocument.cpp +++ b/Source/WebCore/html/ImageDocument.cpp @@ -152,8 +152,8 @@ void ImageDocumentParser::finish() if (document()->frame()->loader()->documentLoader()->isLoadingMultipartContent()) data = data->copy(); - cachedImage->finishLoading(data.get()); cachedImage->finish(); + cachedImage->finishLoading(data.get()); cachedImage->setResponse(document()->frame()->loader()->documentLoader()->response()); |