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

Side by Side Diff: Source/core/svg/graphics/SVGImage.cpp

Issue 457973003: We should call FrameView::updateLayoutAndStyleForPainting before painting (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Needs rebaseline Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/frame/LocalFrame.cpp ('k') | Source/web/WebLocalFrameImpl.cpp » ('j') | 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 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 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 280
281 context->translate(destOffset.x(), destOffset.y()); 281 context->translate(destOffset.x(), destOffset.y());
282 context->scale(scale.width(), scale.height()); 282 context->scale(scale.width(), scale.height());
283 283
284 FrameView* view = frameView(); 284 FrameView* view = frameView();
285 view->resize(containerSize()); 285 view->resize(containerSize());
286 286
287 if (!m_url.isEmpty()) 287 if (!m_url.isEmpty())
288 view->scrollToFragment(m_url); 288 view->scrollToFragment(m_url);
289 289
290 if (view->needsLayout()) 290 view->updateLayoutAndStyleForPainting();
291 view->layout();
292
293 view->paint(context, enclosingIntRect(srcRect)); 291 view->paint(context, enclosingIntRect(srcRect));
294 ASSERT(!view->needsLayout()); 292 ASSERT(!view->needsLayout());
295 293
296 if (requiresTransparencyLayer) 294 if (requiresTransparencyLayer)
297 context->endLayer(); 295 context->endLayer();
298 296
299 stateSaver.restore(); 297 stateSaver.restore();
300 298
301 if (imageObserver()) 299 if (imageObserver())
302 imageObserver()->didDraw(this); 300 imageObserver()->didDraw(this);
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 433
436 return m_page; 434 return m_page;
437 } 435 }
438 436
439 String SVGImage::filenameExtension() const 437 String SVGImage::filenameExtension() const
440 { 438 {
441 return "svg"; 439 return "svg";
442 } 440 }
443 441
444 } 442 }
OLDNEW
« no previous file with comments | « Source/core/frame/LocalFrame.cpp ('k') | Source/web/WebLocalFrameImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698