| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 307 String mimeType = resource->response().mimeType(); | 307 String mimeType = resource->response().mimeType(); |
| 308 m_resources->append(SerializedResource(url, mimeType, data)); | 308 m_resources->append(SerializedResource(url, mimeType, data)); |
| 309 m_resourceURLs.add(url); | 309 m_resourceURLs.add(url); |
| 310 } | 310 } |
| 311 | 311 |
| 312 void PageSerializer::addImageToResources(ImageResource* image, RenderObject* ima
geRenderer, const KURL& url) | 312 void PageSerializer::addImageToResources(ImageResource* image, RenderObject* ima
geRenderer, const KURL& url) |
| 313 { | 313 { |
| 314 if (!shouldAddURL(url)) | 314 if (!shouldAddURL(url)) |
| 315 return; | 315 return; |
| 316 | 316 |
| 317 if (!image || image->image() == Image::nullImage()) | 317 if (!image || image->image() == Image::nullImage() || image->errorOccurred()
) |
| 318 return; | 318 return; |
| 319 | 319 |
| 320 RefPtr<SharedBuffer> data = imageRenderer ? image->imageForRenderer(imageRen
derer)->data() : 0; | 320 RefPtr<SharedBuffer> data = imageRenderer ? image->imageForRenderer(imageRen
derer)->data() : 0; |
| 321 if (!data) | 321 if (!data) |
| 322 data = image->image()->data(); | 322 data = image->image()->data(); |
| 323 | 323 |
| 324 addToResources(image, data, url); | 324 addToResources(image, data, url); |
| 325 } | 325 } |
| 326 | 326 |
| 327 void PageSerializer::addFontToResources(FontResource* font) | 327 void PageSerializer::addFontToResources(FontResource* font) |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 379 if (iter != m_blankFrameURLs.end()) | 379 if (iter != m_blankFrameURLs.end()) |
| 380 return iter->value; | 380 return iter->value; |
| 381 String url = "wyciwyg://frame/" + String::number(m_blankFrameCounter++); | 381 String url = "wyciwyg://frame/" + String::number(m_blankFrameCounter++); |
| 382 KURL fakeURL(ParsedURLString, url); | 382 KURL fakeURL(ParsedURLString, url); |
| 383 m_blankFrameURLs.add(frame, fakeURL); | 383 m_blankFrameURLs.add(frame, fakeURL); |
| 384 | 384 |
| 385 return fakeURL; | 385 return fakeURL; |
| 386 } | 386 } |
| 387 | 387 |
| 388 } | 388 } |
| OLD | NEW |