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

Side by Side Diff: third_party/WebKit/Source/core/html/track/LoadableTextTrack.cpp

Issue 1740483004: Rename enums/functions that collide in chromium style in core/html/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-5
Patch Set: get-names-6: . Created 4 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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 } 58 }
59 59
60 void LoadableTextTrack::setMode(const AtomicString& mode) 60 void LoadableTextTrack::setMode(const AtomicString& mode)
61 { 61 {
62 TextTrack::setMode(mode); 62 TextTrack::setMode(mode);
63 #if !ENABLE(OILPAN) 63 #if !ENABLE(OILPAN)
64 if (!m_trackElement) 64 if (!m_trackElement)
65 return; 65 return;
66 #endif 66 #endif
67 67
68 if (m_trackElement->readyState() == HTMLTrackElement::NONE) 68 if (m_trackElement->getReadyState() == HTMLTrackElement::NONE)
69 m_trackElement->scheduleLoad(); 69 m_trackElement->scheduleLoad();
70 } 70 }
71 71
72 void LoadableTextTrack::addRegions(const HeapVector<Member<VTTRegion>>& newRegio ns) 72 void LoadableTextTrack::addRegions(const HeapVector<Member<VTTRegion>>& newRegio ns)
73 { 73 {
74 for (size_t i = 0; i < newRegions.size(); ++i) { 74 for (size_t i = 0; i < newRegions.size(); ++i) {
75 newRegions[i]->setTrack(this); 75 newRegions[i]->setTrack(this);
76 regions()->add(newRegions[i]); 76 regions()->add(newRegions[i]);
77 } 77 }
78 } 78 }
(...skipping 16 matching lines...) Expand all
95 return 0; 95 return 0;
96 } 96 }
97 97
98 DEFINE_TRACE(LoadableTextTrack) 98 DEFINE_TRACE(LoadableTextTrack)
99 { 99 {
100 visitor->trace(m_trackElement); 100 visitor->trace(m_trackElement);
101 TextTrack::trace(visitor); 101 TextTrack::trace(visitor);
102 } 102 }
103 103
104 } // namespace blink 104 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/track/CueTimeline.cpp ('k') | third_party/WebKit/Source/core/html/track/TextTrack.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698