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

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

Issue 2670643004: Rename EDisplay values with k prefix. (Closed)
Patch Set: Rebase Created 3 years, 9 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
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 19 matching lines...) Expand all
30 #include "core/frame/DeprecatedScheduleStyleRecalcDuringLayout.h" 30 #include "core/frame/DeprecatedScheduleStyleRecalcDuringLayout.h"
31 #include "core/layout/LayoutVideo.h" 31 #include "core/layout/LayoutVideo.h"
32 32
33 namespace blink { 33 namespace blink {
34 34
35 LayoutTextTrackContainer::LayoutTextTrackContainer(Element* element) 35 LayoutTextTrackContainer::LayoutTextTrackContainer(Element* element)
36 : LayoutBlockFlow(element), m_fontSize(0) {} 36 : LayoutBlockFlow(element), m_fontSize(0) {}
37 37
38 void LayoutTextTrackContainer::layout() { 38 void LayoutTextTrackContainer::layout() {
39 LayoutBlockFlow::layout(); 39 LayoutBlockFlow::layout();
40 if (style()->display() == EDisplay::None) 40 if (style()->display() == EDisplay::kNone)
41 return; 41 return;
42 42
43 DeprecatedScheduleStyleRecalcDuringLayout marker( 43 DeprecatedScheduleStyleRecalcDuringLayout marker(
44 node()->document().lifecycle()); 44 node()->document().lifecycle());
45 45
46 LayoutObject* mediaLayoutObject = parent(); 46 LayoutObject* mediaLayoutObject = parent();
47 if (!mediaLayoutObject || !mediaLayoutObject->isVideo()) 47 if (!mediaLayoutObject || !mediaLayoutObject->isVideo())
48 return; 48 return;
49 if (updateSizes(toLayoutVideo(*mediaLayoutObject))) 49 if (updateSizes(toLayoutVideo(*mediaLayoutObject)))
50 toElement(node())->setInlineStyleProperty( 50 toElement(node())->setInlineStyleProperty(
(...skipping 18 matching lines...) Expand all
69 // the behavior is currently not portable. fontSize may have precision higher 69 // the behavior is currently not portable. fontSize may have precision higher
70 // than m_fontSize thus straight comparison can fail despite they cast to the 70 // than m_fontSize thus straight comparison can fail despite they cast to the
71 // same float value. 71 // same float value.
72 volatile float& currentFontSize = m_fontSize; 72 volatile float& currentFontSize = m_fontSize;
73 float oldFontSize = currentFontSize; 73 float oldFontSize = currentFontSize;
74 currentFontSize = fontSize; 74 currentFontSize = fontSize;
75 return currentFontSize != oldFontSize; 75 return currentFontSize != oldFontSize;
76 } 76 }
77 77
78 } // namespace blink 78 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698