Add a new IGNORE_EXCEPTION helper to ignore ExceptionCodes when they are expected but uninteresting
https://bugs.webkit.org/show_bug.cgi?id=108771
Reviewed by Eric Seidel.
In cases where the ExceptionCode passed into a function is completely
ignored, this patch replaces it with a new IGNORE_EXCEPTION macro. This
makes our expectations about possible exceptions (or lack thereof)
explicit, rather than relying on implicit assumptions about whether a
variable is intentionally uninitialized or not. It also removes
knowledge about the internals of ExceptionCodes (that they're currently
ints, for instance) from code that shouldn't care, which will help with
future refactorings.
The implementation is entirely based upon ASSERT_NO_EXCEPTION, and
shouldn't have any visible effect on the web. As long as all the
current tests pass, we're good.
* Modules/indexeddb/IDBRequest.cpp:
(WebCore::IDBRequest::dispatchEvent):
(WebCore::IDBRequest::uncaughtExceptionInEventHandler):
* Modules/indexeddb/IDBTransaction.cpp:
(WebCore::IDBTransaction::stop):
* Modules/websockets/WebSocketChannel.cpp:
(WebCore::WebSocketChannel::processBuffer):
* dom/Document.cpp:
(WebCore::Document::processHttpEquiv):
* dom/ExceptionCodePlaceholder.h:
(WebCore):
* dom/Node.cpp:
(WebCore::Node::normalize):
* dom/Text.cpp:
(WebCore::Text::replaceWholeText):
* editing/AlternativeTextController.cpp:
(WebCore::AlternativeTextController::insertDictatedText):
* editing/AppendNodeCommand.cpp:
(WebCore::AppendNodeCommand::doApply):
(WebCore::AppendNodeCommand::doUnapply):
* editing/CompositeEditCommand.cpp:
(WebCore::CompositeEditCommand::insertNewDefaultParagraphElementAt):
* editing/DeleteFromTextNodeCommand.cpp:
(WebCore::DeleteFromTextNodeCommand::doUnapply):
* editing/Editor.cpp:
(WebCore::dispatchEditableContentChangedEvents):
(WebCore::Editor::applyEditingStyleToElement):
* editing/EditorCommand.cpp:
(WebCore::executeFormatBlock):
* editing/FormatBlockCommand.cpp:
(WebCore::FormatBlockCommand::elementForFormatBlockCommand):
* editing/InsertIntoTextNodeCommand.cpp:
(WebCore::InsertIntoTextNodeCommand::doApply):
(WebCore::InsertIntoTextNodeCommand::doUnapply):
* editing/InsertListCommand.cpp:
(WebCore::InsertListCommand::doApplyForSingleParagraph):
* editing/InsertNodeBeforeCommand.cpp:
(WebCore::InsertNodeBeforeCommand::doApply):
(WebCore::InsertNodeBeforeCommand::doUnapply):
* editing/RemoveCSSPropertyCommand.cpp:
(WebCore::RemoveCSSPropertyCommand::doApply):
(WebCore::RemoveCSSPropertyCommand::doUnapply):
* editing/RemoveNodeCommand.cpp:
(WebCore::RemoveNodeCommand::doApply):
(WebCore::RemoveNodeCommand::doUnapply):
* editing/ReplaceSelectionCommand.cpp:
(WebCore::ReplaceSelectionCommand::removeRedundantStylesAndKeepStyleSpanInline):
* editing/TextIterator.cpp:
(WebCore::TextIterator::getLocationAndLengthFromRange):
* editing/WrapContentsInDummySpanCommand.cpp:
(WebCore::WrapContentsInDummySpanCommand::executeApply):
(WebCore::WrapContentsInDummySpanCommand::doUnapply):
* editing/htmlediting.cpp:
(WebCore::comparePositions):
* editing/markup.cpp:
(WebCore::highestAncestorToWrapMarkup):
* html/FTPDirectoryDocument.cpp:
(WebCore::FTPDirectoryDocumentParser::appendEntry):
(WebCore::FTPDirectoryDocumentParser::createTDForFilename):
(WebCore::FTPDirectoryDocumentParser::loadDocumentTemplate):
(WebCore::FTPDirectoryDocumentParser::createBasicDocument):
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::rewind):
(WebCore::HTMLMediaElement::returnToRealtime):
(WebCore::HTMLMediaElement::playInternal):
(WebCore::HTMLMediaElement::percentLoaded):
(WebCore::HTMLMediaElement::mediaPlayerTimeChanged):
(WebCore::HTMLMediaElement::mediaPlayerDurationChanged):
(WebCore::HTMLMediaElement::applyMediaFragmentURI):
* html/HTMLOutputElement.cpp:
(WebCore::HTMLOutputElement::setTextContentInternal):
* html/HTMLSelectElement.cpp:
(WebCore::HTMLSelectElement::remove):
* html/HTMLTableElement.cpp:
(WebCore::HTMLTableElement::createTHead):
(WebCore::HTMLTableElement::deleteTHead):
(WebCore::HTMLTableElement::createTFoot):
(WebCore::HTMLTableElement::deleteTFoot):
(WebCore::HTMLTableElement::createCaption):
(WebCore::HTMLTableElement::deleteCaption):
* html/HTMLTextAreaElement.cpp:
(WebCore::HTMLTextAreaElement::setDefaultValue):
* html/ImageDocument.cpp:
(WebCore::ImageDocument::createDocumentStructure):
* html/InputType.cpp:
(WebCore::InputType::stepUpFromRenderer):
* html/MediaController.cpp:
(MediaController::bringElementUpToSpeed):
(MediaController::asyncEventTimerFired):
* html/MediaDocument.cpp:
(WebCore::MediaDocumentParser::createDocumentStructure):
(WebCore::MediaDocument::replaceMediaElementTimerFired):
* html/PluginDocument.cpp:
(WebCore::PluginDocumentParser::createDocumentStructure):
* html/RangeInputType.cpp:
(WebCore::RangeInputType::handleKeydownEvent):
* html/TimeRanges.cpp:
(TimeRanges::contain):
(TimeRanges::nearest):
* html/canvas/CanvasRenderingContext2D.cpp:
(WebCore::CanvasRenderingContext2D::drawImageFromRect):
* html/shadow/MediaControlElementTypes.cpp:
(WebCore::MediaControlSeekButtonElement::seekTimerFired):
* html/shadow/MediaControlElements.cpp:
(WebCore::MediaControlPanelElement::setPosition):
(WebCore::MediaControlPanelElement::resetPosition):
(WebCore::MediaControlStatusDisplayElement::update):
(WebCore::MediaControlRewindButtonElement::defaultEventHandler):
(WebCore::MediaControlTimelineElement::defaultEventHandler):
* html/shadow/MediaControls.cpp:
(WebCore::MediaControls::updateCurrentTimeDisplay):
(WebCore::MediaControls::createTextTrackDisplay):
* html/shadow/MediaControlsApple.cpp:
(WebCore::MediaControlsApple::updateCurrentTimeDisplay):
* html/shadow/MediaControlsBlackBerry.cpp:
(WebCore::MediaControlEmbeddedPanelElement::setPosition):
(WebCore::MediaControlEmbeddedPanelElement::resetPosition):
(WebCore::MediaControlFullscreenTimelineElement::defaultEventHandler):
(WebCore::MediaControlsBlackBerry::updateCurrentTimeDisplay):
* html/shadow/MediaControlsChromium.cpp:
(WebCore::MediaControlsChromium::updateCurrentTimeDisplay):
* html/track/InbandTextTrack.cpp:
(WebCore::InbandTextTrack::addGenericCue):
* inspector/InspectorCSSAgent.cpp:
(WebCore::InspectorCSSAgent::buildArrayForMatchedRuleList):
* inspector/InspectorHistory.cpp:
(WebCore::InspectorHistory::markUndoableState):
* inspector/InspectorResourceAgent.cpp:
(WebCore::InspectorResourceAgent::replayXHR):
* page/ContextMenuController.cpp:
(WebCore::ContextMenuController::contextMenuItemSelected):
* page/DOMWindow.cpp:
(WebCore::didAddStorageEventListener):
* page/DragController.cpp:
(WebCore::documentFragmentFromDragData):
* page/EventHandler.cpp:
(WebCore::EventHandler::dispatchDragEvent):
(WebCore::EventHandler::keyEvent):
(WebCore::EventHandler::handleTextInputEvent):
* page/Page.cpp:
(WebCore::Page::findStringMatchingRanges):
* platform/efl/RenderThemeEfl.cpp:
(WebCore::RenderThemeEfl::paintMediaSliderTrack):
* platform/graphics/blackberry/MediaPlayerPrivateBlackBerry.cpp:
(WebCore::MediaPlayerPrivate::percentLoaded):
* platform/gtk/RenderThemeGtk.cpp:
(WebCore::RenderThemeGtk::paintMediaSliderTrack):
* platform/mac/PasteboardMac.mm:
(WebCore::Pasteboard::getDataSelection):
(WebCore::documentFragmentWithImageResource):
(WebCore::Pasteboard::documentFragment):
* platform/mac/WebVideoFullscreenHUDWindowController.mm:
(-[WebVideoFullscreenHUDWindowController setCurrentTime:]):
(-[WebVideoFullscreenHUDWindowController setVolume:]):
* platform/qt/RenderThemeQt.cpp:
(WebCore::RenderThemeQt::paintMediaSliderTrack):
* rendering/RenderNamedFlowThread.cpp:
(WebCore::RenderNamedFlowThread::getRanges):
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::paintMediaSliderTrack):
* svg/SVGTRefElement.cpp:
(WebCore::SVGTRefElement::detachTarget):
* xml/XMLTreeViewer.cpp:
(WebCore::XMLTreeViewer::transformDocumentToTreeView):
* xml/parser/XMLDocumentParserLibxml2.cpp:
(WebCore::XMLDocumentParser::endElementNs):
* xml/parser/XMLDocumentParserQt.cpp:
(WebCore::XMLDocumentParser::parseEndElement):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@142271 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/html/FTPDirectoryDocument.cpp b/Source/WebCore/html/FTPDirectoryDocument.cpp
index c1a0150..c17622a 100644
--- a/Source/WebCore/html/FTPDirectoryDocument.cpp
+++ b/Source/WebCore/html/FTPDirectoryDocument.cpp
@@ -26,6 +26,7 @@
#if ENABLE(FTPDIR)
#include "FTPDirectoryDocument.h"
+#include "ExceptionCodePlaceholder.h"
#include "HTMLDocumentParser.h"
#include "HTMLNames.h"
#include "HTMLTableElement.h"
@@ -109,38 +110,34 @@
void FTPDirectoryDocumentParser::appendEntry(const String& filename, const String& size, const String& date, bool isDirectory)
{
- ExceptionCode ec;
-
- RefPtr<Element> rowElement = m_tableElement->insertRow(-1, ec);
- rowElement->setAttribute("class", "ftpDirectoryEntryRow", ec);
+ RefPtr<Element> rowElement = m_tableElement->insertRow(-1, IGNORE_EXCEPTION);
+ rowElement->setAttribute("class", "ftpDirectoryEntryRow", IGNORE_EXCEPTION);
RefPtr<Element> element = document()->createElement(tdTag, false);
- element->appendChild(Text::create(document(), String(&noBreakSpace, 1)), ec);
+ element->appendChild(Text::create(document(), String(&noBreakSpace, 1)), IGNORE_EXCEPTION);
if (isDirectory)
- element->setAttribute("class", "ftpDirectoryIcon ftpDirectoryTypeDirectory", ec);
+ element->setAttribute("class", "ftpDirectoryIcon ftpDirectoryTypeDirectory", IGNORE_EXCEPTION);
else
- element->setAttribute("class", "ftpDirectoryIcon ftpDirectoryTypeFile", ec);
- rowElement->appendChild(element, ec);
+ element->setAttribute("class", "ftpDirectoryIcon ftpDirectoryTypeFile", IGNORE_EXCEPTION);
+ rowElement->appendChild(element, IGNORE_EXCEPTION);
element = createTDForFilename(filename);
- element->setAttribute("class", "ftpDirectoryFileName", ec);
- rowElement->appendChild(element, ec);
+ element->setAttribute("class", "ftpDirectoryFileName", IGNORE_EXCEPTION);
+ rowElement->appendChild(element, IGNORE_EXCEPTION);
element = document()->createElement(tdTag, false);
- element->appendChild(Text::create(document(), date), ec);
- element->setAttribute("class", "ftpDirectoryFileDate", ec);
- rowElement->appendChild(element, ec);
+ element->appendChild(Text::create(document(), date), IGNORE_EXCEPTION);
+ element->setAttribute("class", "ftpDirectoryFileDate", IGNORE_EXCEPTION);
+ rowElement->appendChild(element, IGNORE_EXCEPTION);
element = document()->createElement(tdTag, false);
- element->appendChild(Text::create(document(), size), ec);
- element->setAttribute("class", "ftpDirectoryFileSize", ec);
- rowElement->appendChild(element, ec);
+ element->appendChild(Text::create(document(), size), IGNORE_EXCEPTION);
+ element->setAttribute("class", "ftpDirectoryFileSize", IGNORE_EXCEPTION);
+ rowElement->appendChild(element, IGNORE_EXCEPTION);
}
PassRefPtr<Element> FTPDirectoryDocumentParser::createTDForFilename(const String& filename)
{
- ExceptionCode ec;
-
String fullURL = document()->baseURL().string();
if (fullURL[fullURL.length() - 1] == '/')
fullURL.append(filename);
@@ -148,11 +145,11 @@
fullURL.append("/" + filename);
RefPtr<Element> anchorElement = document()->createElement(aTag, false);
- anchorElement->setAttribute("href", fullURL, ec);
- anchorElement->appendChild(Text::create(document(), filename), ec);
+ anchorElement->setAttribute("href", fullURL, IGNORE_EXCEPTION);
+ anchorElement->appendChild(Text::create(document(), filename), IGNORE_EXCEPTION);
RefPtr<Element> tdElement = document()->createElement(tdTag, false);
- tdElement->appendChild(anchorElement, ec);
+ tdElement->appendChild(anchorElement, IGNORE_EXCEPTION);
return tdElement.release();
}
@@ -319,16 +316,15 @@
// Otherwise create one manually
tableElement = document()->createElement(tableTag, false);
m_tableElement = static_cast<HTMLTableElement*>(tableElement.get());
- ExceptionCode ec;
- m_tableElement->setAttribute("id", "ftpDirectoryTable", ec);
+ m_tableElement->setAttribute("id", "ftpDirectoryTable", IGNORE_EXCEPTION);
// If we didn't find the table element, lets try to append our own to the body
// If that fails for some reason, cram it on the end of the document as a last
// ditch effort
if (Element* body = document()->body())
- body->appendChild(m_tableElement, ec);
+ body->appendChild(m_tableElement, IGNORE_EXCEPTION);
else
- document()->appendChild(m_tableElement, ec);
+ document()->appendChild(m_tableElement, IGNORE_EXCEPTION);
return true;
}
@@ -341,14 +337,13 @@
RefPtr<Element> bodyElement = document()->createElement(bodyTag, false);
- ExceptionCode ec;
- document()->appendChild(bodyElement, ec);
+ document()->appendChild(bodyElement, IGNORE_EXCEPTION);
RefPtr<Element> tableElement = document()->createElement(tableTag, false);
m_tableElement = static_cast<HTMLTableElement*>(tableElement.get());
- m_tableElement->setAttribute("id", "ftpDirectoryTable", ec);
+ m_tableElement->setAttribute("id", "ftpDirectoryTable", IGNORE_EXCEPTION);
- bodyElement->appendChild(m_tableElement, ec);
+ bodyElement->appendChild(m_tableElement, IGNORE_EXCEPTION);
}
void FTPDirectoryDocumentParser::append(const SegmentedString& source)
diff --git a/Source/WebCore/html/HTMLMediaElement.cpp b/Source/WebCore/html/HTMLMediaElement.cpp
index 8399f2c..30afd36 100644
--- a/Source/WebCore/html/HTMLMediaElement.cpp
+++ b/Source/WebCore/html/HTMLMediaElement.cpp
@@ -44,6 +44,7 @@
#include "Event.h"
#include "EventNames.h"
#include "ExceptionCode.h"
+#include "ExceptionCodePlaceholder.h"
#include "Frame.h"
#include "FrameLoader.h"
#include "FrameLoaderClient.h"
@@ -1992,17 +1993,14 @@
void HTMLMediaElement::rewind(float timeDelta)
{
LOG(Media, "HTMLMediaElement::rewind(%f)", timeDelta);
-
- ExceptionCode e;
- setCurrentTime(max(currentTime() - timeDelta, minTimeSeekable()), e);
+ setCurrentTime(max(currentTime() - timeDelta, minTimeSeekable()), IGNORE_EXCEPTION);
}
void HTMLMediaElement::returnToRealtime()
{
LOG(Media, "HTMLMediaElement::returnToRealtime");
- ExceptionCode e;
- setCurrentTime(maxTimeSeekable(), e);
-}
+ setCurrentTime(maxTimeSeekable(), IGNORE_EXCEPTION);
+}
void HTMLMediaElement::addPlayedRange(float start, float end)
{
@@ -2406,10 +2404,8 @@
if (!m_player || m_networkState == NETWORK_EMPTY)
scheduleLoad(MediaResource);
- if (endedPlayback()) {
- ExceptionCode unused;
- seek(0, unused);
- }
+ if (endedPlayback())
+ seek(0, IGNORE_EXCEPTION);
if (m_mediaController)
m_mediaController->bringElementUpToSpeed(this);
@@ -2752,9 +2748,8 @@
float buffered = 0;
RefPtr<TimeRanges> timeRanges = m_player->buffered();
for (unsigned i = 0; i < timeRanges->length(); ++i) {
- ExceptionCode ignoredException;
- float start = timeRanges->start(i, ignoredException);
- float end = timeRanges->end(i, ignoredException);
+ float start = timeRanges->start(i, IGNORE_EXCEPTION);
+ float end = timeRanges->end(i, IGNORE_EXCEPTION);
buffered += end - start;
}
return buffered / duration;
@@ -3358,10 +3353,9 @@
if (!isnan(dur) && dur && now >= dur && m_playbackRate > 0) {
// If the media element has a loop attribute specified and does not have a current media controller,
if (loop() && !m_mediaController) {
- ExceptionCode ignoredException;
m_sentEndEvent = false;
// then seek to the earliest possible position of the media resource and abort these steps.
- seek(startTime(), ignoredException);
+ seek(startTime(), IGNORE_EXCEPTION);
} else {
// If the media element does not have a current media controller, and the media element
// has still ended playback, and the direction of playback is still forwards, and paused
@@ -3425,9 +3419,8 @@
float now = currentTime();
float dur = duration();
- ExceptionCode ignoredException;
if (now > dur)
- seek(dur, ignoredException);
+ seek(dur, IGNORE_EXCEPTION);
endProcessingMediaPlayerCallback();
}
@@ -4611,9 +4604,8 @@
void HTMLMediaElement::applyMediaFragmentURI()
{
if (m_fragmentStartTime != MediaPlayer::invalidTime()) {
- ExceptionCode ignoredException;
m_sentEndEvent = false;
- seek(m_fragmentStartTime, ignoredException);
+ seek(m_fragmentStartTime, IGNORE_EXCEPTION);
}
}
diff --git a/Source/WebCore/html/HTMLOutputElement.cpp b/Source/WebCore/html/HTMLOutputElement.cpp
index a83902a..1ac1109 100644
--- a/Source/WebCore/html/HTMLOutputElement.cpp
+++ b/Source/WebCore/html/HTMLOutputElement.cpp
@@ -31,6 +31,7 @@
#include "config.h"
#include "HTMLOutputElement.h"
+#include "ExceptionCodePlaceholder.h"
#include "HTMLFormElement.h"
#include "HTMLNames.h"
@@ -136,9 +137,8 @@
void HTMLOutputElement::setTextContentInternal(const String& value)
{
ASSERT(!m_isSetTextContentInProgress);
- ExceptionCode ec;
m_isSetTextContentInProgress = true;
- setTextContent(value, ec);
+ setTextContent(value, IGNORE_EXCEPTION);
}
} // namespace
diff --git a/Source/WebCore/html/HTMLSelectElement.cpp b/Source/WebCore/html/HTMLSelectElement.cpp
index 2cb7af2..5955cbf 100644
--- a/Source/WebCore/html/HTMLSelectElement.cpp
+++ b/Source/WebCore/html/HTMLSelectElement.cpp
@@ -33,6 +33,7 @@
#include "Chrome.h"
#include "ChromeClient.h"
#include "EventNames.h"
+#include "ExceptionCodePlaceholder.h"
#include "FormController.h"
#include "FormDataList.h"
#include "Frame.h"
@@ -224,8 +225,7 @@
if (listIndex < 0)
return;
- ExceptionCode ec;
- listItems()[listIndex]->remove(ec);
+ listItems()[listIndex]->remove(IGNORE_EXCEPTION);
}
void HTMLSelectElement::remove(HTMLOptionElement* option)
@@ -233,8 +233,7 @@
if (option->ownerSelectElement() != this)
return;
- ExceptionCode ec;
- option->remove(ec);
+ option->remove(IGNORE_EXCEPTION);
}
String HTMLSelectElement::value() const
diff --git a/Source/WebCore/html/HTMLTableElement.cpp b/Source/WebCore/html/HTMLTableElement.cpp
index 59f0b0c..d0eb12d 100644
--- a/Source/WebCore/html/HTMLTableElement.cpp
+++ b/Source/WebCore/html/HTMLTableElement.cpp
@@ -32,6 +32,7 @@
#include "CSSValueKeywords.h"
#include "CSSValuePool.h"
#include "ExceptionCode.h"
+#include "ExceptionCodePlaceholder.h"
#include "HTMLNames.h"
#include "HTMLParserIdioms.h"
#include "HTMLTableCaptionElement.h"
@@ -128,15 +129,13 @@
if (HTMLTableSectionElement* existingHead = tHead())
return existingHead;
RefPtr<HTMLTableSectionElement> head = HTMLTableSectionElement::create(theadTag, document());
- ExceptionCode ec;
- setTHead(head, ec);
+ setTHead(head, IGNORE_EXCEPTION);
return head.release();
}
void HTMLTableElement::deleteTHead()
{
- ExceptionCode ec;
- removeChild(tHead(), ec);
+ removeChild(tHead(), IGNORE_EXCEPTION);
}
PassRefPtr<HTMLElement> HTMLTableElement::createTFoot()
@@ -144,15 +143,13 @@
if (HTMLTableSectionElement* existingFoot = tFoot())
return existingFoot;
RefPtr<HTMLTableSectionElement> foot = HTMLTableSectionElement::create(tfootTag, document());
- ExceptionCode ec;
- setTFoot(foot, ec);
+ setTFoot(foot, IGNORE_EXCEPTION);
return foot.release();
}
void HTMLTableElement::deleteTFoot()
{
- ExceptionCode ec;
- removeChild(tFoot(), ec);
+ removeChild(tFoot(), IGNORE_EXCEPTION);
}
PassRefPtr<HTMLElement> HTMLTableElement::createTBody()
@@ -168,15 +165,13 @@
if (HTMLTableCaptionElement* existingCaption = caption())
return existingCaption;
RefPtr<HTMLTableCaptionElement> caption = HTMLTableCaptionElement::create(captionTag, document());
- ExceptionCode ec;
- setCaption(caption, ec);
+ setCaption(caption, IGNORE_EXCEPTION);
return caption.release();
}
void HTMLTableElement::deleteCaption()
{
- ExceptionCode ec;
- removeChild(caption(), ec);
+ removeChild(caption(), IGNORE_EXCEPTION);
}
HTMLTableSectionElement* HTMLTableElement::lastBody() const
diff --git a/Source/WebCore/html/HTMLTextAreaElement.cpp b/Source/WebCore/html/HTMLTextAreaElement.cpp
index bfff4bf..adf4d5a 100644
--- a/Source/WebCore/html/HTMLTextAreaElement.cpp
+++ b/Source/WebCore/html/HTMLTextAreaElement.cpp
@@ -34,6 +34,7 @@
#include "Event.h"
#include "EventNames.h"
#include "ExceptionCode.h"
+#include "ExceptionCodePlaceholder.h"
#include "FormController.h"
#include "FormDataList.h"
#include "Frame.h"
@@ -417,17 +418,16 @@
if (n->isTextNode())
textNodes.append(n);
}
- ExceptionCode ec;
size_t size = textNodes.size();
for (size_t i = 0; i < size; ++i)
- removeChild(textNodes[i].get(), ec);
+ removeChild(textNodes[i].get(), IGNORE_EXCEPTION);
// Normalize line endings.
String value = defaultValue;
value.replace("\r\n", "\n");
value.replace('\r', '\n');
- insertBefore(document()->createTextNode(value), firstChild(), ec);
+ insertBefore(document()->createTextNode(value), firstChild(), IGNORE_EXCEPTION);
if (!m_isDirty)
setNonDirtyValue(value);
diff --git a/Source/WebCore/html/ImageDocument.cpp b/Source/WebCore/html/ImageDocument.cpp
index 51a0304..c6352fc 100644
--- a/Source/WebCore/html/ImageDocument.cpp
+++ b/Source/WebCore/html/ImageDocument.cpp
@@ -29,6 +29,7 @@
#include "DocumentLoader.h"
#include "EventListener.h"
#include "EventNames.h"
+#include "ExceptionCodePlaceholder.h"
#include "Frame.h"
#include "FrameLoaderClient.h"
#include "FrameView.h"
@@ -192,10 +193,8 @@
void ImageDocument::createDocumentStructure()
{
- ExceptionCode ec;
-
RefPtr<Element> rootElement = Document::createElement(htmlTag, false);
- appendChild(rootElement, ec);
+ appendChild(rootElement, IGNORE_EXCEPTION);
static_cast<HTMLHtmlElement*>(rootElement.get())->insertedByParser();
if (frame() && frame()->loader())
@@ -204,7 +203,7 @@
RefPtr<Element> body = Document::createElement(bodyTag, false);
body->setAttribute(styleAttr, "margin: 0px;");
- rootElement->appendChild(body, ec);
+ rootElement->appendChild(body, IGNORE_EXCEPTION);
RefPtr<ImageDocumentElement> imageElement = ImageDocumentElement::create(this);
@@ -212,7 +211,7 @@
imageElement->setLoadManually(true);
imageElement->setSrc(url().string());
- body->appendChild(imageElement, ec);
+ body->appendChild(imageElement, IGNORE_EXCEPTION);
if (shouldShrinkToFit()) {
// Add event listeners
diff --git a/Source/WebCore/html/InputType.cpp b/Source/WebCore/html/InputType.cpp
index 64d231f..e0b2940 100644
--- a/Source/WebCore/html/InputType.cpp
+++ b/Source/WebCore/html/InputType.cpp
@@ -40,6 +40,7 @@
#include "ElementShadow.h"
#include "EmailInputType.h"
#include "ExceptionCode.h"
+#include "ExceptionCodePlaceholder.h"
#include "FileInputType.h"
#include "FileList.h"
#include "FormController.h"
@@ -1095,20 +1096,17 @@
String currentStringValue = element()->value();
Decimal current = parseToNumberOrNaN(currentStringValue);
if (!current.isFinite()) {
- ExceptionCode ec;
current = defaultValueForStepUp();
const Decimal nextDiff = step * n;
if (current < stepRange.minimum() - nextDiff)
current = stepRange.minimum() - nextDiff;
if (current > stepRange.maximum() - nextDiff)
current = stepRange.maximum() - nextDiff;
- setValueAsDecimal(current, DispatchInputAndChangeEvent, ec);
+ setValueAsDecimal(current, DispatchInputAndChangeEvent, IGNORE_EXCEPTION);
}
- if ((sign > 0 && current < stepRange.minimum()) || (sign < 0 && current > stepRange.maximum())) {
- ExceptionCode ec;
- setValueAsDecimal(sign > 0 ? stepRange.minimum() : stepRange.maximum(), DispatchInputAndChangeEvent, ec);
- } else {
- ExceptionCode ec;
+ if ((sign > 0 && current < stepRange.minimum()) || (sign < 0 && current > stepRange.maximum()))
+ setValueAsDecimal(sign > 0 ? stepRange.minimum() : stepRange.maximum(), DispatchInputAndChangeEvent, IGNORE_EXCEPTION);
+ else {
if (stepMismatch(element()->value())) {
ASSERT(!step.isZero());
const Decimal base = stepRange.stepBase();
@@ -1125,13 +1123,13 @@
if (newValue > stepRange.maximum())
newValue = stepRange.maximum();
- setValueAsDecimal(newValue, n == 1 || n == -1 ? DispatchInputAndChangeEvent : DispatchNoEvent, ec);
+ setValueAsDecimal(newValue, n == 1 || n == -1 ? DispatchInputAndChangeEvent : DispatchNoEvent, IGNORE_EXCEPTION);
if (n > 1)
- applyStep(n - 1, AnyIsDefaultStep, DispatchInputAndChangeEvent, ec);
+ applyStep(n - 1, AnyIsDefaultStep, DispatchInputAndChangeEvent, IGNORE_EXCEPTION);
else if (n < -1)
- applyStep(n + 1, AnyIsDefaultStep, DispatchInputAndChangeEvent, ec);
+ applyStep(n + 1, AnyIsDefaultStep, DispatchInputAndChangeEvent, IGNORE_EXCEPTION);
} else
- applyStep(n, AnyIsDefaultStep, DispatchInputAndChangeEvent, ec);
+ applyStep(n, AnyIsDefaultStep, DispatchInputAndChangeEvent, IGNORE_EXCEPTION);
}
}
diff --git a/Source/WebCore/html/MediaController.cpp b/Source/WebCore/html/MediaController.cpp
index 2bd61b6..5bf4f49 100644
--- a/Source/WebCore/html/MediaController.cpp
+++ b/Source/WebCore/html/MediaController.cpp
@@ -481,8 +481,7 @@
// When the user agent is to bring a media element up to speed with its new media controller,
// it must seek that media element to the MediaController's media controller position relative
// to the media element's timeline.
- ExceptionCode ignoredCode = 0;
- element->seek(currentTime(), ignoredCode);
+ element->seek(currentTime(), IGNORE_EXCEPTION);
}
bool MediaController::isBlocked() const
@@ -544,12 +543,11 @@
void MediaController::asyncEventTimerFired(Timer<MediaController>*)
{
Vector<RefPtr<Event> > pendingEvents;
- ExceptionCode ec = 0;
-
+
m_pendingEvents.swap(pendingEvents);
size_t count = pendingEvents.size();
for (size_t index = 0; index < count; ++index)
- dispatchEvent(pendingEvents[index].release(), ec);
+ dispatchEvent(pendingEvents[index].release(), IGNORE_EXCEPTION);
}
void MediaController::clearPositionTimerFired(Timer<MediaController>*)
diff --git a/Source/WebCore/html/MediaDocument.cpp b/Source/WebCore/html/MediaDocument.cpp
index 2251512..f8a302c 100644
--- a/Source/WebCore/html/MediaDocument.cpp
+++ b/Source/WebCore/html/MediaDocument.cpp
@@ -30,6 +30,7 @@
#include "DocumentLoader.h"
#include "EventNames.h"
+#include "ExceptionCodePlaceholder.h"
#include "Frame.h"
#include "FrameLoaderClient.h"
#include "HTMLEmbedElement.h"
@@ -71,9 +72,8 @@
void MediaDocumentParser::createDocumentStructure()
{
- ExceptionCode ec;
RefPtr<Element> rootElement = document()->createElement(htmlTag, false);
- document()->appendChild(rootElement, ec);
+ document()->appendChild(rootElement, IGNORE_EXCEPTION);
document()->setCSSTarget(rootElement.get());
static_cast<HTMLHtmlElement*>(rootElement.get())->insertedByParser();
@@ -81,7 +81,7 @@
document()->frame()->loader()->dispatchDocumentElementAvailable();
RefPtr<Element> body = document()->createElement(bodyTag, false);
- rootElement->appendChild(body, ec);
+ rootElement->appendChild(body, IGNORE_EXCEPTION);
RefPtr<Element> mediaElement = document()->createElement(videoTag, false);
@@ -98,8 +98,8 @@
if (DocumentLoader* loader = document()->loader())
source->setType(loader->responseMIMEType());
- m_mediaElement->appendChild(sourceElement, ec);
- body->appendChild(mediaElement, ec);
+ m_mediaElement->appendChild(sourceElement, IGNORE_EXCEPTION);
+ body->appendChild(mediaElement, IGNORE_EXCEPTION);
Frame* frame = document()->frame();
if (!frame)
@@ -233,8 +233,7 @@
if (documentLoader)
embedElement->setAttribute(typeAttr, documentLoader->writer()->mimeType());
- ExceptionCode ec;
- videoElement->parentNode()->replaceChild(embedElement, videoElement, ec);
+ videoElement->parentNode()->replaceChild(embedElement, videoElement, IGNORE_EXCEPTION);
}
}
diff --git a/Source/WebCore/html/PluginDocument.cpp b/Source/WebCore/html/PluginDocument.cpp
index 474d991..9456b61b 100644
--- a/Source/WebCore/html/PluginDocument.cpp
+++ b/Source/WebCore/html/PluginDocument.cpp
@@ -26,6 +26,7 @@
#include "PluginDocument.h"
#include "DocumentLoader.h"
+#include "ExceptionCodePlaceholder.h"
#include "Frame.h"
#include "FrameLoaderClient.h"
#include "FrameView.h"
@@ -67,9 +68,8 @@
void PluginDocumentParser::createDocumentStructure()
{
- ExceptionCode ec;
RefPtr<Element> rootElement = document()->createElement(htmlTag, false);
- document()->appendChild(rootElement, ec);
+ document()->appendChild(rootElement, IGNORE_EXCEPTION);
static_cast<HTMLHtmlElement*>(rootElement.get())->insertedByParser();
if (document()->frame() && document()->frame()->loader())
@@ -80,7 +80,7 @@
body->setAttribute(marginheightAttr, "0");
body->setAttribute(styleAttr, "background-color: rgb(38,38,38)");
- rootElement->appendChild(body, ec);
+ rootElement->appendChild(body, IGNORE_EXCEPTION);
RefPtr<Element> embedElement = document()->createElement(embedTag, false);
@@ -98,7 +98,7 @@
static_cast<PluginDocument*>(document())->setPluginNode(m_embedElement);
- body->appendChild(embedElement, ec);
+ body->appendChild(embedElement, IGNORE_EXCEPTION);
}
void PluginDocumentParser::appendBytes(DocumentWriter*, const char*, size_t)
diff --git a/Source/WebCore/html/RangeInputType.cpp b/Source/WebCore/html/RangeInputType.cpp
index beca7ad..75afd1e 100644
--- a/Source/WebCore/html/RangeInputType.cpp
+++ b/Source/WebCore/html/RangeInputType.cpp
@@ -34,6 +34,7 @@
#include "AXObjectCache.h"
#include "ElementShadow.h"
+#include "ExceptionCodePlaceholder.h"
#include "HTMLDivElement.h"
#include "HTMLInputElement.h"
#include "HTMLNames.h"
@@ -242,9 +243,8 @@
if (newValue != current) {
EventQueueScope scope;
- ExceptionCode ec;
TextFieldEventBehavior eventBehavior = DispatchChangeEvent;
- setValueAsDecimal(newValue, eventBehavior, ec);
+ setValueAsDecimal(newValue, eventBehavior, IGNORE_EXCEPTION);
if (AXObjectCache::accessibilityEnabled())
element()->document()->axObjectCache()->postNotification(element(), AXObjectCache::AXValueChanged, true);
diff --git a/Source/WebCore/html/TimeRanges.cpp b/Source/WebCore/html/TimeRanges.cpp
index d68ea03..c22474a 100644
--- a/Source/WebCore/html/TimeRanges.cpp
+++ b/Source/WebCore/html/TimeRanges.cpp
@@ -28,6 +28,7 @@
#include "TimeRanges.h"
#include "ExceptionCode.h"
+#include "ExceptionCodePlaceholder.h"
#include <math.h>
using namespace WebCore;
@@ -156,23 +157,21 @@
}
bool TimeRanges::contain(float time) const
-{
- ExceptionCode unused;
+{
for (unsigned n = 0; n < length(); n++) {
- if (time >= start(n, unused) && time <= end(n, unused))
+ if (time >= start(n, IGNORE_EXCEPTION) && time <= end(n, IGNORE_EXCEPTION))
return true;
}
return false;
}
float TimeRanges::nearest(float time) const
-{
- ExceptionCode unused;
+{
float closest = 0;
unsigned count = length();
for (unsigned ndx = 0; ndx < count; ndx++) {
- float startTime = start(ndx, unused);
- float endTime = end(ndx, unused);
+ float startTime = start(ndx, IGNORE_EXCEPTION);
+ float endTime = end(ndx, IGNORE_EXCEPTION);
if (time >= startTime && time <= endTime)
return time;
if (fabs(startTime - time) < closest)
diff --git a/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp b/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp
index 4575cdb..704d470 100644
--- a/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp
+++ b/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp
@@ -44,6 +44,7 @@
#include "Console.h"
#include "DOMPath.h"
#include "ExceptionCode.h"
+#include "ExceptionCodePlaceholder.h"
#include "FloatConversion.h"
#include "FloatQuad.h"
#include "FontCache.h"
@@ -1513,8 +1514,7 @@
if (!parseCompositeAndBlendOperator(compositeOperation, op, blendOp) || blendOp != BlendModeNormal)
op = CompositeSourceOver;
- ExceptionCode ec;
- drawImage(image, FloatRect(sx, sy, sw, sh), FloatRect(dx, dy, dw, dh), op, BlendModeNormal, ec);
+ drawImage(image, FloatRect(sx, sy, sw, sh), FloatRect(dx, dy, dw, dh), op, BlendModeNormal, IGNORE_EXCEPTION);
}
void CanvasRenderingContext2D::setAlpha(float alpha)
diff --git a/Source/WebCore/html/shadow/MediaControlElementTypes.cpp b/Source/WebCore/html/shadow/MediaControlElementTypes.cpp
index a043134..f54f879 100644
--- a/Source/WebCore/html/shadow/MediaControlElementTypes.cpp
+++ b/Source/WebCore/html/shadow/MediaControlElementTypes.cpp
@@ -33,6 +33,7 @@
#include "MediaControlElementTypes.h"
#include "CSSValueKeywords.h"
+#include "ExceptionCodePlaceholder.h"
#include "FloatConversion.h"
#include "HTMLNames.h"
#include "MouseEvent.h"
@@ -263,9 +264,8 @@
void MediaControlSeekButtonElement::seekTimerFired(Timer<MediaControlSeekButtonElement>*)
{
if (m_seekType == Skip) {
- ExceptionCode ec;
float skipTime = isForwardButton() ? cSkipTime : -cSkipTime;
- mediaController()->setCurrentTime(mediaController()->currentTime() + skipTime, ec);
+ mediaController()->setCurrentTime(mediaController()->currentTime() + skipTime, IGNORE_EXCEPTION);
} else
mediaController()->setPlaybackRate(nextRate());
}
diff --git a/Source/WebCore/html/shadow/MediaControlElements.cpp b/Source/WebCore/html/shadow/MediaControlElements.cpp
index ba78bb0..dd5a2a9 100644
--- a/Source/WebCore/html/shadow/MediaControlElements.cpp
+++ b/Source/WebCore/html/shadow/MediaControlElements.cpp
@@ -36,6 +36,7 @@
#include "DOMTokenList.h"
#include "EventNames.h"
#include "EventTarget.h"
+#include "ExceptionCodePlaceholder.h"
#include "FloatConversion.h"
#include "Frame.h"
#include "GraphicsContext.h"
@@ -172,8 +173,7 @@
setInlineStyleProperty(CSSPropertyMarginLeft, 0.0, CSSPrimitiveValue::CSS_PX);
setInlineStyleProperty(CSSPropertyMarginTop, 0.0, CSSPrimitiveValue::CSS_PX);
- ExceptionCode ignored;
- classList()->add("dragged", ignored);
+ classList()->add("dragged", IGNORE_EXCEPTION);
}
void MediaControlPanelElement::resetPosition()
@@ -183,8 +183,7 @@
removeInlineStyleProperty(CSSPropertyMarginLeft);
removeInlineStyleProperty(CSSPropertyMarginTop);
- ExceptionCode ignored;
- classList()->remove("dragged", ignored);
+ classList()->remove("dragged", IGNORE_EXCEPTION);
m_cumulativeDragOffset.setX(0);
m_cumulativeDragOffset.setY(0);
@@ -384,8 +383,6 @@
if (newStateToDisplay == m_stateBeingDisplayed)
return;
- ExceptionCode e;
-
if (m_stateBeingDisplayed == Nothing)
show();
else if (newStateToDisplay == Nothing)
@@ -395,13 +392,13 @@
switch (m_stateBeingDisplayed) {
case Nothing:
- setInnerText("", e);
+ setInnerText("", IGNORE_EXCEPTION);
break;
case Loading:
- setInnerText(mediaElementLoadingStateText(), e);
+ setInnerText(mediaElementLoadingStateText(), IGNORE_EXCEPTION);
break;
case LiveBroadcast:
- setInnerText(mediaElementLiveBroadcastStateText(), e);
+ setInnerText(mediaElementLiveBroadcastStateText(), IGNORE_EXCEPTION);
break;
}
}
@@ -605,8 +602,7 @@
void MediaControlRewindButtonElement::defaultEventHandler(Event* event)
{
if (event->type() == eventNames().clickEvent) {
- ExceptionCode ignoredCode;
- mediaController()->setCurrentTime(max(0.0f, mediaController()->currentTime() - 30), ignoredCode);
+ mediaController()->setCurrentTime(max(0.0f, mediaController()->currentTime() - 30), IGNORE_EXCEPTION);
event->setDefaultHandled();
}
HTMLInputElement::defaultEventHandler(event);
@@ -952,10 +948,8 @@
return;
float time = narrowPrecisionToFloat(value().toDouble());
- if (event->type() == eventNames().inputEvent && time != mediaController()->currentTime()) {
- ExceptionCode ec;
- mediaController()->setCurrentTime(time, ec);
- }
+ if (event->type() == eventNames().inputEvent && time != mediaController()->currentTime())
+ mediaController()->setCurrentTime(time, IGNORE_EXCEPTION);
RenderSlider* slider = toRenderSlider(renderer());
if (slider && slider->inDragMode())
diff --git a/Source/WebCore/html/shadow/MediaControls.cpp b/Source/WebCore/html/shadow/MediaControls.cpp
index c00d36d..a5b3fb5 100644
--- a/Source/WebCore/html/shadow/MediaControls.cpp
+++ b/Source/WebCore/html/shadow/MediaControls.cpp
@@ -29,6 +29,8 @@
#if ENABLE(VIDEO)
#include "MediaControls.h"
+#include "ExceptionCodePlaceholder.h"
+
namespace WebCore {
MediaControls::MediaControls(Document* document)
@@ -217,8 +219,7 @@
if (!page)
return;
- ExceptionCode ec;
- m_currentTimeDisplay->setInnerText(page->theme()->formatMediaControlsTime(now), ec);
+ m_currentTimeDisplay->setInnerText(page->theme()->formatMediaControlsTime(now), IGNORE_EXCEPTION);
m_currentTimeDisplay->setCurrentValue(now);
}
@@ -380,8 +381,7 @@
m_textDisplayContainer->setMediaController(m_mediaController);
// Insert it before the first controller element so it always displays behind the controls.
- ExceptionCode ec;
- insertBefore(textDisplayContainer, m_panel, ec, true);
+ insertBefore(textDisplayContainer, m_panel, IGNORE_EXCEPTION, true);
textDisplayContainer->createSubtrees(document());
textDisplayContainer.release();
}
diff --git a/Source/WebCore/html/shadow/MediaControlsApple.cpp b/Source/WebCore/html/shadow/MediaControlsApple.cpp
index 9b51fe3..80952de 100644
--- a/Source/WebCore/html/shadow/MediaControlsApple.cpp
+++ b/Source/WebCore/html/shadow/MediaControlsApple.cpp
@@ -30,6 +30,7 @@
#include "MediaControlsApple.h"
#include "Chrome.h"
+#include "ExceptionCodePlaceholder.h"
#include "HTMLMediaElement.h"
#include "HTMLNames.h"
#include "MediaControlElements.h"
@@ -377,10 +378,9 @@
return;
// Allow the theme to format the time.
- ExceptionCode ec;
- m_currentTimeDisplay->setInnerText(page->theme()->formatMediaControlsCurrentTime(now, duration), ec);
+ m_currentTimeDisplay->setInnerText(page->theme()->formatMediaControlsCurrentTime(now, duration), IGNORE_EXCEPTION);
m_currentTimeDisplay->setCurrentValue(now);
- m_timeRemainingDisplay->setInnerText(page->theme()->formatMediaControlsRemainingTime(now, duration), ec);
+ m_timeRemainingDisplay->setInnerText(page->theme()->formatMediaControlsRemainingTime(now, duration), IGNORE_EXCEPTION);
m_timeRemainingDisplay->setCurrentValue(now - duration);
}
diff --git a/Source/WebCore/html/shadow/MediaControlsBlackBerry.cpp b/Source/WebCore/html/shadow/MediaControlsBlackBerry.cpp
index eb92657..69dce06 100644
--- a/Source/WebCore/html/shadow/MediaControlsBlackBerry.cpp
+++ b/Source/WebCore/html/shadow/MediaControlsBlackBerry.cpp
@@ -32,6 +32,7 @@
#include "Chrome.h"
#include "DOMTokenList.h"
+#include "ExceptionCodePlaceholder.h"
#include "FloatConversion.h"
#include "Frame.h"
#include "HTMLMediaElement.h"
@@ -197,8 +198,7 @@
setInlineStyleProperty(CSSPropertyMarginLeft, 0.0, CSSPrimitiveValue::CSS_PX);
setInlineStyleProperty(CSSPropertyMarginTop, 0.0, CSSPrimitiveValue::CSS_PX);
- ExceptionCode ignored;
- classList()->add("dragged", ignored);
+ classList()->add("dragged", IGNORE_EXCEPTION);
}
void MediaControlEmbeddedPanelElement::resetPosition()
@@ -208,8 +208,7 @@
removeInlineStyleProperty(CSSPropertyMarginLeft);
removeInlineStyleProperty(CSSPropertyMarginTop);
- ExceptionCode ignored;
- classList()->remove("dragged", ignored);
+ classList()->remove("dragged", IGNORE_EXCEPTION);
m_cumulativeDragOffset.setX(0);
m_cumulativeDragOffset.setY(0);
@@ -507,10 +506,8 @@
return;
float time = narrowPrecisionToFloat(value().toDouble());
- if (event->type() == eventNames().inputEvent && time != mediaController()->currentTime()) {
- ExceptionCode ec;
- mediaController()->setCurrentTime(time, ec);
- }
+ if (event->type() == eventNames().inputEvent && time != mediaController()->currentTime())
+ mediaController()->setCurrentTime(time, IGNORE_EXCEPTION);
RenderSlider* slider = toRenderSlider(renderer());
if (slider && slider->inDragMode())
@@ -1011,14 +1008,13 @@
return;
// Allow the theme to format the time.
- ExceptionCode ec;
- m_currentTimeDisplay->setInnerText(page->theme()->formatMediaControlsCurrentTime(now, duration), ec);
+ m_currentTimeDisplay->setInnerText(page->theme()->formatMediaControlsCurrentTime(now, duration), IGNORE_EXCEPTION);
m_currentTimeDisplay->setCurrentValue(now);
- m_fullscreenCurrentTimeDisplay->setInnerText(page->theme()->formatMediaControlsCurrentTime(now, duration), ec);
+ m_fullscreenCurrentTimeDisplay->setInnerText(page->theme()->formatMediaControlsCurrentTime(now, duration), IGNORE_EXCEPTION);
m_fullscreenCurrentTimeDisplay->setCurrentValue(now);
- m_timeRemainingDisplay->setInnerText(page->theme()->formatMediaControlsRemainingTime(now, duration), ec);
+ m_timeRemainingDisplay->setInnerText(page->theme()->formatMediaControlsRemainingTime(now, duration), IGNORE_EXCEPTION);
m_timeRemainingDisplay->setCurrentValue(now - duration);
- m_fullscreenTimeRemainingDisplay->setInnerText(page->theme()->formatMediaControlsRemainingTime(now, duration), ec);
+ m_fullscreenTimeRemainingDisplay->setInnerText(page->theme()->formatMediaControlsRemainingTime(now, duration), IGNORE_EXCEPTION);
m_fullscreenTimeRemainingDisplay->setCurrentValue(now - duration);
}
diff --git a/Source/WebCore/html/shadow/MediaControlsChromium.cpp b/Source/WebCore/html/shadow/MediaControlsChromium.cpp
index 55cfac2..4641b9d 100644
--- a/Source/WebCore/html/shadow/MediaControlsChromium.cpp
+++ b/Source/WebCore/html/shadow/MediaControlsChromium.cpp
@@ -29,6 +29,8 @@
#if ENABLE(VIDEO)
#include "MediaControlsChromium.h"
+#include "ExceptionCodePlaceholder.h"
+
using namespace std;
namespace WebCore {
@@ -185,8 +187,7 @@
}
// Allow the theme to format the time.
- ExceptionCode ec;
- m_currentTimeDisplay->setInnerText(page->theme()->formatMediaControlsCurrentTime(now, duration), ec);
+ m_currentTimeDisplay->setInnerText(page->theme()->formatMediaControlsCurrentTime(now, duration), IGNORE_EXCEPTION);
m_currentTimeDisplay->setCurrentValue(now);
}
diff --git a/Source/WebCore/html/track/InbandTextTrack.cpp b/Source/WebCore/html/track/InbandTextTrack.cpp
index e68e0de..883c1ac 100644
--- a/Source/WebCore/html/track/InbandTextTrack.cpp
+++ b/Source/WebCore/html/track/InbandTextTrack.cpp
@@ -31,6 +31,7 @@
#include "Document.h"
#include "Event.h"
+#include "ExceptionCodePlaceholder.h"
#include "InbandTextTrackPrivate.h"
#include "Logging.h"
#include "MediaPlayer.h"
@@ -120,19 +121,18 @@
cue->setFontSizeMultiplier(cueData->relativeFontSize());
cue->setFontName(cueData->fontName());
- ExceptionCode ec;
if (cueData->position() > 0)
- cue->setPosition(lround(cueData->position()), ec);
+ cue->setPosition(lround(cueData->position()), IGNORE_EXCEPTION);
if (cueData->line() > 0)
- cue->setLine(lround(cueData->line()), ec);
+ cue->setLine(lround(cueData->line()), IGNORE_EXCEPTION);
if (cueData->size() > 0)
- cue->setSize(lround(cueData->size()), ec);
+ cue->setSize(lround(cueData->size()), IGNORE_EXCEPTION);
if (cueData->align() == GenericCueData::Start)
- cue->setAlign(ASCIILiteral("start"), ec);
+ cue->setAlign(ASCIILiteral("start"), IGNORE_EXCEPTION);
else if (cueData->align() == GenericCueData::Middle)
- cue->setAlign(ASCIILiteral("middle"), ec);
+ cue->setAlign(ASCIILiteral("middle"), IGNORE_EXCEPTION);
else if (cueData->align() == GenericCueData::End)
- cue->setAlign(ASCIILiteral("end"), ec);
+ cue->setAlign(ASCIILiteral("end"), IGNORE_EXCEPTION);
cue->setSnapToLines(false);
if (hasCue(cue.get())) {
