third_party/WebKit/Source/core/layout/LayoutTextTrackContainer.cpp - Issue 1541793002: Remove config.h inclusion from third_party/WebKit/Source/core/layout/.

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutTextTrackContainer.cpp

Issue 1541793002: Remove config.h inclusion from third_party/WebKit/Source/core/layout/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 12 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

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.

11 * 2. Redistributions in binary form must reproduce the above copyright	11 * 2. Redistributions in binary form must reproduce the above copyright

12 * notice, this list of conditions and the following disclaimer in the	12 * notice, this list of conditions and the following disclaimer in the

13 * documentation and/or other materials provided with the distribution.	13 * documentation and/or other materials provided with the distribution.

14 *	14 *

15 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY	15 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY

16 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE	16 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

17 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR	17 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

18 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR	18 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR

19 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,	19 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

20 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,	20 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR	21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

22 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY	22 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY

23 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	23 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE	24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

25 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	25 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

26 */	26 */

27	27

28 #include "config.h"

29 #include "core/layout/LayoutTextTrackContainer.h"	28 #include "core/layout/LayoutTextTrackContainer.h"

30	29

31 #include "core/frame/DeprecatedScheduleStyleRecalcDuringLayout.h"	30 #include "core/frame/DeprecatedScheduleStyleRecalcDuringLayout.h"

32 #include "core/layout/LayoutVideo.h"	31 #include "core/layout/LayoutVideo.h"

33	32

34 namespace blink {	33 namespace blink {

35	34

36 LayoutTextTrackContainer::LayoutTextTrackContainer(Element* element)	35 LayoutTextTrackContainer::LayoutTextTrackContainer(Element* element)

37 : LayoutBlockFlow(element)	36 : LayoutBlockFlow(element)

38 , m_fontSize(0)	37 , m_fontSize(0)

(...skipping 29 matching lines...) Expand all Loading...
68 float smallestDimension = std::min(m_videoSize.height(), m_videoSize.width() );	67 float smallestDimension = std::min(m_videoSize.height(), m_videoSize.width() );

69	68

70 float fontSize = smallestDimension * 0.05f;	69 float fontSize = smallestDimension * 0.05f;

71 if (m_fontSize == fontSize)	70 if (m_fontSize == fontSize)

72 return false;	71 return false;

73 m_fontSize = fontSize;	72 m_fontSize = fontSize;

74 return true;	73 return true;

75 }	74 }

76	75

77 } // namespace blink	76 } // namespace blink

OLD	NEW