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

Side by Side Diff: Source/core/rendering/RenderMediaControlElements.cpp

Issue 380583003: Revert of Revert of Divorce PaintInvalidationState from LayoutState (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 5 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/rendering/RenderListItem.cpp ('k') | Source/core/rendering/RenderObject.h » ('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) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
3 * Copyright (C) 2012 Google Inc. 3 * Copyright (C) 2012 Google Inc.
4 * All rights reserved. 4 * 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 void RenderTextTrackContainerElement::layout() 42 void RenderTextTrackContainerElement::layout()
43 { 43 {
44 RenderBlockFlow::layout(); 44 RenderBlockFlow::layout();
45 if (style()->display() == NONE) 45 if (style()->display() == NONE)
46 return; 46 return;
47 47
48 ASSERT(mediaControlElementType(node()) == MediaTextTrackDisplayContainer); 48 ASSERT(mediaControlElementType(node()) == MediaTextTrackDisplayContainer);
49 49
50 DeprecatedScheduleStyleRecalcDuringLayout marker(node()->document().lifecycl e()); 50 DeprecatedScheduleStyleRecalcDuringLayout marker(node()->document().lifecycl e());
51 51
52 ForceHorriblySlowRectMapping slowRectMapping(*this);
53 static_cast<MediaControlTextTrackContainerElement*>(node())->updateSizes(); 52 static_cast<MediaControlTextTrackContainerElement*>(node())->updateSizes();
54 } 53 }
55 54
56 } // namespace WebCore 55 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderListItem.cpp ('k') | Source/core/rendering/RenderObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698