Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(681)

Side by Side Diff: WebCore/loader/ImageDocument.cpp

Issue 3776004: Revert 66670 - 2010-09-01 Tony Gentilcore <tonyg@chromium.org>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/517/
Patch Set: Created 10 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « WebCore/html/parser/HTMLScriptRunner.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 return; 131 return;
132 132
133 CachedImage* cachedImage = document()->cachedImage(); 133 CachedImage* cachedImage = document()->cachedImage();
134 cachedImage->data(frame->loader()->documentLoader()->mainResourceData(), fal se); 134 cachedImage->data(frame->loader()->documentLoader()->mainResourceData(), fal se);
135 135
136 document()->imageChanged(); 136 document()->imageChanged();
137 } 137 }
138 138
139 void ImageDocumentParser::finish() 139 void ImageDocumentParser::finish()
140 { 140 {
141 if (!isStopped() && document()->imageElement()) { 141 if (!m_parserStopped && document()->imageElement()) {
142 CachedImage* cachedImage = document()->cachedImage(); 142 CachedImage* cachedImage = document()->cachedImage();
143 RefPtr<SharedBuffer> data = document()->frame()->loader()->documentLoade r()->mainResourceData(); 143 RefPtr<SharedBuffer> data = document()->frame()->loader()->documentLoade r()->mainResourceData();
144 144
145 // If this is a multipart image, make a copy of the current part, since the resource data 145 // If this is a multipart image, make a copy of the current part, since the resource data
146 // will be overwritten by the next part. 146 // will be overwritten by the next part.
147 if (document()->frame()->loader()->documentLoader()->isLoadingMultipartC ontent()) 147 if (document()->frame()->loader()->documentLoader()->isLoadingMultipartC ontent())
148 data = data->copy(); 148 data = data->copy();
149 149
150 cachedImage->data(data.release(), true); 150 cachedImage->data(data.release(), true);
151 cachedImage->finish(); 151 cachedImage->finish();
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 void ImageDocumentElement::willMoveToNewOwnerDocument() 405 void ImageDocumentElement::willMoveToNewOwnerDocument()
406 { 406 {
407 if (m_imageDocument) { 407 if (m_imageDocument) {
408 m_imageDocument->disconnectImageElement(); 408 m_imageDocument->disconnectImageElement();
409 m_imageDocument = 0; 409 m_imageDocument = 0;
410 } 410 }
411 HTMLImageElement::willMoveToNewOwnerDocument(); 411 HTMLImageElement::willMoveToNewOwnerDocument();
412 } 412 }
413 413
414 } 414 }
OLDNEW
« no previous file with comments | « WebCore/html/parser/HTMLScriptRunner.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698