OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2006 Eric Seidel <eric@webkit.org> | 2 * Copyright (C) 2006 Eric Seidel <eric@webkit.org> |
3 * Copyright (C) 2008, 2009 Apple Inc. All rights reserved. | 3 * Copyright (C) 2008, 2009 Apple Inc. All rights reserved. |
4 * Copyright (C) Research In Motion Limited 2011. All rights reserved. | 4 * Copyright (C) Research In Motion Limited 2011. All rights reserved. |
5 * | 5 * |
6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
8 * are met: | 8 * are met: |
9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
271 context->translate(destOffset.x(), destOffset.y()); | 271 context->translate(destOffset.x(), destOffset.y()); |
272 context->scale(scale); | 272 context->scale(scale); |
273 | 273 |
274 FrameView* view = frameView(); | 274 FrameView* view = frameView(); |
275 view->resize(containerSize()); | 275 view->resize(containerSize()); |
276 | 276 |
277 if (view->needsLayout()) | 277 if (view->needsLayout()) |
278 view->layout(); | 278 view->layout(); |
279 | 279 |
280 view->paint(context, enclosingIntRect(srcRect)); | 280 view->paint(context, enclosingIntRect(srcRect)); |
| 281 ASSERT(!view->needsLayout()); |
281 | 282 |
282 if (requiresTransparencyLayer) | 283 if (requiresTransparencyLayer) |
283 context->endLayer(); | 284 context->endLayer(); |
284 | 285 |
285 stateSaver.restore(); | 286 stateSaver.restore(); |
286 | 287 |
287 if (imageObserver()) | 288 if (imageObserver()) |
288 imageObserver()->didDraw(this); | 289 imageObserver()->didDraw(this); |
289 | 290 |
290 // Start any (SMIL) animations if needed. This will restart or continue | 291 // Start any (SMIL) animations if needed. This will restart or continue |
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
421 | 422 |
422 return m_page; | 423 return m_page; |
423 } | 424 } |
424 | 425 |
425 String SVGImage::filenameExtension() const | 426 String SVGImage::filenameExtension() const |
426 { | 427 { |
427 return "svg"; | 428 return "svg"; |
428 } | 429 } |
429 | 430 |
430 } | 431 } |
OLD | NEW |