Source/core/rendering/RenderMediaControlElements.cpp - Issue 377123002: Revert of Divorce PaintInvalidationState from LayoutState

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 377123002: Revert of Divorce PaintInvalidationState from LayoutState (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Fix conflict 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 »

OLD	NEW
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 Loading...
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);

52 static_cast<MediaControlTextTrackContainerElement*>(node())->updateSizes();	53 static_cast<MediaControlTextTrackContainerElement*>(node())->updateSizes();

53 }	54 }

54	55

55 } // namespace WebCore	56 } // namespace WebCore

OLD	NEW