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

Side by Side Diff: Source/core/html/TimeRanges.cpp

Issue 197213012: Improve media-related exception messages (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: remove redundant TimeRanges test Created 6 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/html/HTMLMediaElement.cpp ('k') | Source/core/html/track/vtt/VTTCue.cpp » ('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) 2007, 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2009, 2010 Apple 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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "core/html/TimeRanges.h" 27 #include "core/html/TimeRanges.h"
28 28
29 #include "bindings/v8/ExceptionMessages.h"
29 #include "bindings/v8/ExceptionState.h" 30 #include "bindings/v8/ExceptionState.h"
30 #include "bindings/v8/ExceptionStatePlaceholder.h" 31 #include "bindings/v8/ExceptionStatePlaceholder.h"
31 #include "core/dom/ExceptionCode.h" 32 #include "core/dom/ExceptionCode.h"
32 #include <math.h> 33 #include <math.h>
33 34
34 using namespace WebCore; 35 using namespace WebCore;
35 using namespace std; 36 using namespace std;
36 37
37 TimeRanges::TimeRanges(double start, double end) 38 TimeRanges::TimeRanges(double start, double end)
38 { 39 {
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 const Range& range = other->m_ranges[index]; 110 const Range& range = other->m_ranges[index];
110 unioned->add(range.m_start, range.m_end); 111 unioned->add(range.m_start, range.m_end);
111 } 112 }
112 113
113 m_ranges.swap(unioned->m_ranges); 114 m_ranges.swap(unioned->m_ranges);
114 } 115 }
115 116
116 double TimeRanges::start(unsigned index, ExceptionState& exceptionState) const 117 double TimeRanges::start(unsigned index, ExceptionState& exceptionState) const
117 { 118 {
118 if (index >= length()) { 119 if (index >= length()) {
119 exceptionState.throwDOMException(IndexSizeError, "The index provided (" + String::number(index) + ") is not less than the object's length (" + String::n umber(length()) + ")."); 120 exceptionState.throwDOMException(IndexSizeError, ExceptionMessages::inde xExceedsMaximumBound("index", index, length()));
120 return 0; 121 return 0;
121 } 122 }
122 return m_ranges[index].m_start; 123 return m_ranges[index].m_start;
123 } 124 }
124 125
125 double TimeRanges::end(unsigned index, ExceptionState& exceptionState) const 126 double TimeRanges::end(unsigned index, ExceptionState& exceptionState) const
126 { 127 {
127 if (index >= length()) { 128 if (index >= length()) {
128 exceptionState.throwDOMException(IndexSizeError, "The index provided (" + String::number(index) + ") is not less than the object's length (" + String::n umber(length()) + ")."); 129 exceptionState.throwDOMException(IndexSizeError, ExceptionMessages::inde xExceedsMaximumBound("index", index, length()));
129 return 0; 130 return 0;
130 } 131 }
131 return m_ranges[index].m_end; 132 return m_ranges[index].m_end;
132 } 133 }
133 134
134 void TimeRanges::add(double start, double end) 135 void TimeRanges::add(double start, double end)
135 { 136 {
136 ASSERT(start <= end); 137 ASSERT(start <= end);
137 unsigned int overlappingArcIndex; 138 unsigned int overlappingArcIndex;
138 Range addedRange(start, end); 139 Range addedRange(start, end);
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 double endTime = end(ndx, IGNORE_EXCEPTION); 193 double endTime = end(ndx, IGNORE_EXCEPTION);
193 if (time >= startTime && time <= endTime) 194 if (time >= startTime && time <= endTime)
194 return time; 195 return time;
195 if (fabs(startTime - time) < closest) 196 if (fabs(startTime - time) < closest)
196 closest = fabs(startTime - time); 197 closest = fabs(startTime - time);
197 else if (fabs(endTime - time) < closest) 198 else if (fabs(endTime - time) < closest)
198 closest = fabs(endTime - time); 199 closest = fabs(endTime - time);
199 } 200 }
200 return closest; 201 return closest;
201 } 202 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLMediaElement.cpp ('k') | Source/core/html/track/vtt/VTTCue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698