Diff
Modified: trunk/Source/WebCore/ChangeLog (141876 => 141877)
--- trunk/Source/WebCore/ChangeLog 2013-02-05 10:10:18 UTC (rev 141876)
+++ trunk/Source/WebCore/ChangeLog 2013-02-05 10:13:50 UTC (rev 141877)
@@ -1,3 +1,68 @@
+2013-02-05 Mike West <[email protected]>
+
+ Cleanup: Use exceptionless Range::* methods rather than ignoring exceptions.
+ https://bugs.webkit.org/show_bug.cgi?id=108773
+
+ Reviewed by Darin Adler.
+
+ We often call Range::{start,end}{Container,Offset} with an ExceptionCode
+ that's completely ignored. In these cases, we should simply use the
+ exceptionless version of the method instead.
+
+ * dom/DocumentMarkerController.cpp:
+ (WebCore::DocumentMarkerController::addMarker):
+ Here, I also moved parameters onto one line to make the
+ stylebot happy.
+ (WebCore::DocumentMarkerController::addTextMatchMarker):
+ (WebCore::DocumentMarkerController::setMarkersActive):
+ Dropped ignored ExceptionCode variable entirely.
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::visiblePositionForIndex):
+ Can't drop the variable because of the selectNodeContents call.
+ * editing/Editor.cpp:
+ (WebCore::Editor::canDeleteRange):
+ Dropped ignored ExceptionCode variable entirely.
+ (WebCore::Editor::advanceToNextMisspelling):
+ Can't drop the variable because of setStart/setEnd.
+ * editing/EditorCommand.cpp:
+ (WebCore::unionDOMRanges):
+ Can't drop the variable because of compareBoundaryPoints.
+ * editing/MarkupAccumulator.cpp:
+ (WebCore::MarkupAccumulator::appendNodeValue):
+ Dropped ignored ExceptionCode variable entirely.
+ * editing/TextCheckingHelper.cpp:
+ (WebCore::TextCheckingParagraph::offsetAsRange):
+ (WebCore::TextCheckingHelper::findFirstMisspelling):
+ (WebCore::TextCheckingHelper::findFirstGrammarDetail):
+ (WebCore::TextCheckingHelper::findFirstMisspellingOrBadGrammar):
+ * editing/markup.cpp:
+ (WebCore::StyledMarkupAccumulator::renderedText):
+ (WebCore::StyledMarkupAccumulator::stringValueForRange):
+ Dropped ignored ExceptionCode variable entirely.
+ * editing/visible_units.cpp:
+ (WebCore::previousBoundary):
+ Can't drop the variable due to many other calls.
+ * page/DOMSelection.cpp:
+ (WebCore::DOMSelection::deleteFromDocument):
+ (WebCore::DOMSelection::containsNode):
+ For both these cases, the 'ASSERT(!ec)' after the statement I've
+ edited only checked the last occurance of the exception: that is,
+ if 'startXxx(ec)' threw an exception, it would be overwritten by
+ the 'setBaseAndExtend()' or 'compareBoundaryPoints()' exception.
+ Removing the exception parameters from the parameters' calls
+ shouldn't effect behavior.
+ * platform/chromium/PasteboardChromium.cpp:
+ (WebCore::Pasteboard::writeSelection):
+ * platform/mac/HTMLConverter.mm:
+ (+[WebHTMLConverter editingAttributedStringFromRange:]):
+ * platform/win/ClipboardWin.cpp:
+ (WebCore::ClipboardWin::writeRange):
+ * platform/win/PasteboardWin.cpp:
+ (WebCore::Pasteboard::writeSelection):
+ * platform/wince/PasteboardWinCE.cpp:
+ (WebCore::Pasteboard::writeSelection):
+ Dropped ignored ExceptionCode variable entirely.
+
2013-02-05 Yury Semikhatsky <[email protected]>
Web Inspector: introduce Memory.getDOMCounters
Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (141876 => 141877)
--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2013-02-05 10:10:18 UTC (rev 141876)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2013-02-05 10:13:50 UTC (rev 141877)
@@ -1869,7 +1869,7 @@
range->selectNodeContents(node, ec);
CharacterIterator it(range.get());
it.advance(index - 1);
- return VisiblePosition(Position(it.range()->endContainer(ec), it.range()->endOffset(ec), Position::PositionIsOffsetInAnchor), UPSTREAM);
+ return VisiblePosition(Position(it.range()->endContainer(), it.range()->endOffset(), Position::PositionIsOffsetInAnchor), UPSTREAM);
}
int AccessibilityRenderObject::indexForVisiblePosition(const VisiblePosition& pos) const
Modified: trunk/Source/WebCore/dom/DocumentMarkerController.cpp (141876 => 141877)
--- trunk/Source/WebCore/dom/DocumentMarkerController.cpp 2013-02-05 10:10:18 UTC (rev 141876)
+++ trunk/Source/WebCore/dom/DocumentMarkerController.cpp 2013-02-05 10:13:50 UTC (rev 141877)
@@ -64,9 +64,7 @@
// Use a TextIterator to visit the potentially multiple nodes the range covers.
for (TextIterator markedText(range); !markedText.atEnd(); markedText.advance()) {
RefPtr<Range> textPiece = markedText.range();
- int exception = 0;
- addMarker(textPiece->startContainer(exception),
- DocumentMarker(type, textPiece->startOffset(exception), textPiece->endOffset(exception), description));
+ addMarker(textPiece->startContainer(), DocumentMarker(type, textPiece->startOffset(), textPiece->endOffset(), description));
}
}
@@ -75,9 +73,7 @@
// Use a TextIterator to visit the potentially multiple nodes the range covers.
for (TextIterator markedText(range); !markedText.atEnd(); markedText.advance()) {
RefPtr<Range> textPiece = markedText.range();
- int exception = 0;
- addMarker(textPiece->startContainer(exception),
- DocumentMarker(type, textPiece->startOffset(exception), textPiece->endOffset(exception)));
+ addMarker(textPiece->startContainer(), DocumentMarker(type, textPiece->startOffset(), textPiece->endOffset()));
}
}
@@ -98,16 +94,15 @@
// Use a TextIterator to visit the potentially multiple nodes the range covers.
for (TextIterator markedText(range); !markedText.atEnd(); markedText.advance()) {
RefPtr<Range> textPiece = markedText.range();
- int exception = 0;
- unsigned startOffset = textPiece->startOffset(exception);
- unsigned endOffset = textPiece->endOffset(exception);
- addMarker(textPiece->startContainer(exception), DocumentMarker(startOffset, endOffset, activeMatch));
+ unsigned startOffset = textPiece->startOffset();
+ unsigned endOffset = textPiece->endOffset();
+ addMarker(textPiece->startContainer(), DocumentMarker(startOffset, endOffset, activeMatch));
if (endOffset > startOffset) {
// Rendered rects for markers in WebKit are not populated until each time
// the markers are painted. However, we need it to happen sooner, because
// the whole purpose of tickmarks on the scrollbar is to show where
// matches off-screen are (that haven't been painted yet).
- Node* node = textPiece->startContainer(exception);
+ Node* node = textPiece->startContainer();
Vector<DocumentMarker*> markers = markersFor(node);
static_cast<RenderedDocumentMarker*>(markers[markers.size() - 1])->setRenderedRect(range->boundingBox());
}
@@ -567,14 +562,14 @@
return;
ASSERT(!m_markers.isEmpty());
- ExceptionCode ec = 0;
- Node* startContainer = range->startContainer(ec);
- Node* endContainer = range->endContainer(ec);
+ Node* startContainer = range->startContainer();
+ Node* endContainer = range->endContainer();
Node* pastLastNode = range->pastLastNode();
+
for (Node* node = range->firstNode(); node != pastLastNode; node = NodeTraversal::next(node)) {
- int startOffset = node == startContainer ? range->startOffset(ec) : 0;
- int endOffset = node == endContainer ? range->endOffset(ec) : INT_MAX;
+ int startOffset = node == startContainer ? range->startOffset() : 0;
+ int endOffset = node == endContainer ? range->endOffset() : INT_MAX;
setMarkersActive(node, startOffset, endOffset, active);
}
}
Modified: trunk/Source/WebCore/editing/Editor.cpp (141876 => 141877)
--- trunk/Source/WebCore/editing/Editor.cpp 2013-02-05 10:10:18 UTC (rev 141876)
+++ trunk/Source/WebCore/editing/Editor.cpp 2013-02-05 10:13:50 UTC (rev 141877)
@@ -254,15 +254,15 @@
bool Editor::canDeleteRange(Range* range) const
{
- ExceptionCode ec = 0;
- Node* startContainer = range->startContainer(ec);
- Node* endContainer = range->endContainer(ec);
+ Node* startContainer = range->startContainer();
+ Node* endContainer = range->endContainer();
if (!startContainer || !endContainer)
return false;
if (!startContainer->rendererIsEditable() || !endContainer->rendererIsEditable())
return false;
-
+
+ ExceptionCode ec;
if (range->collapsed(ec)) {
VisiblePosition start(range->startPosition(), DOWNSTREAM);
VisiblePosition previous = start.previous();
@@ -1584,7 +1584,7 @@
setStart(spellingSearchRange.get(), endOfWord(oneBeforeStart));
// else we were already at the start of the editable node
}
-
+
if (spellingSearchRange->collapsed(ec))
return; // nothing to search in
@@ -1595,8 +1595,8 @@
// We go to the end of our first range instead of the start of it, just to be sure
// we don't get foiled by any word boundary problems at the start. It means we might
// do a tiny bit more searching.
- Node* searchEndNodeAfterWrap = spellingSearchRange->endContainer(ec);
- int searchEndOffsetAfterWrap = spellingSearchRange->endOffset(ec);
+ Node* searchEndNodeAfterWrap = spellingSearchRange->endContainer();
+ int searchEndOffsetAfterWrap = spellingSearchRange->endOffset();
int misspellingOffset = 0;
GrammarDetail grammarDetail;
@@ -1628,7 +1628,7 @@
// Stop looking at start of next misspelled word
CharacterIterator chars(grammarSearchRange.get());
chars.advance(misspellingOffset);
- grammarSearchRange->setEnd(chars.range()->startContainer(ec), chars.range()->startOffset(ec), ec);
+ grammarSearchRange->setEnd(chars.range()->startContainer(), chars.range()->startOffset(), ec);
}
if (isGrammarCheckingEnabled())
@@ -1662,7 +1662,7 @@
// Stop looking at start of next misspelled word
CharacterIterator chars(grammarSearchRange.get());
chars.advance(misspellingOffset);
- grammarSearchRange->setEnd(chars.range()->startContainer(ec), chars.range()->startOffset(ec), ec);
+ grammarSearchRange->setEnd(chars.range()->startContainer(), chars.range()->startOffset(), ec);
}
if (isGrammarCheckingEnabled())
Modified: trunk/Source/WebCore/editing/EditorCommand.cpp (141876 => 141877)
--- trunk/Source/WebCore/editing/EditorCommand.cpp 2013-02-05 10:10:18 UTC (rev 141876)
+++ trunk/Source/WebCore/editing/EditorCommand.cpp 2013-02-05 10:13:50 UTC (rev 141877)
@@ -272,7 +272,7 @@
Range* end = a->compareBoundaryPoints(Range::END_TO_END, b, ec) <= 0 ? b : a;
ASSERT(!ec);
- return Range::create(a->startContainer(ec)->ownerDocument(), start->startContainer(ec), start->startOffset(ec), end->endContainer(ec), end->endOffset(ec));
+ return Range::create(a->ownerDocument(), start->startContainer(), start->startOffset(), end->endContainer(), end->endOffset());
}
// Execute command functions
Modified: trunk/Source/WebCore/editing/MarkupAccumulator.cpp (141876 => 141877)
--- trunk/Source/WebCore/editing/MarkupAccumulator.cpp 2013-02-05 10:10:18 UTC (rev 141876)
+++ trunk/Source/WebCore/editing/MarkupAccumulator.cpp 2013-02-05 10:13:50 UTC (rev 141877)
@@ -245,11 +245,10 @@
unsigned start = 0;
if (range) {
- ExceptionCode ec;
- if (node == range->endContainer(ec))
- length = range->endOffset(ec);
- if (node == range->startContainer(ec)) {
- start = range->startOffset(ec);
+ if (node == range->endContainer())
+ length = range->endOffset();
+ if (node == range->startContainer()) {
+ start = range->startOffset();
length -= start;
}
}
Modified: trunk/Source/WebCore/editing/TextCheckingHelper.cpp (141876 => 141877)
--- trunk/Source/WebCore/editing/TextCheckingHelper.cpp 2013-02-05 10:10:18 UTC (rev 141876)
+++ trunk/Source/WebCore/editing/TextCheckingHelper.cpp 2013-02-05 10:13:50 UTC (rev 141877)
@@ -183,10 +183,8 @@
PassRefPtr<Range> TextCheckingParagraph::offsetAsRange() const
{
ASSERT(m_checkingRange);
- if (!m_offsetAsRange) {
- ExceptionCode ec = 0;
- m_offsetAsRange = Range::create(paragraphRange()->startContainer(ec)->document(), paragraphRange()->startPosition(), checkingRange()->startPosition());
- }
+ if (!m_offsetAsRange)
+ m_offsetAsRange = Range::create(paragraphRange()->startContainer()->document(), paragraphRange()->startPosition(), checkingRange()->startPosition());
return m_offsetAsRange;
}
@@ -277,9 +275,7 @@
}
// Store marker for misspelled word.
- ExceptionCode ec = 0;
- misspellingRange->startContainer(ec)->document()->markers()->addMarker(misspellingRange.get(), DocumentMarker::Spelling);
- ASSERT(!ec);
+ misspellingRange->startContainer()->document()->markers()->addMarker(misspellingRange.get(), DocumentMarker::Spelling);
// Bail out if we're marking only the first misspelling, and not all instances.
if (!markAll)
@@ -320,7 +316,7 @@
int totalRangeLength = TextIterator::rangeLength(paragraphRange.get());
setEnd(paragraphRange.get(), endOfParagraph(m_range->startPosition()));
- RefPtr<Range> offsetAsRange = Range::create(paragraphRange->startContainer(ec)->document(), paragraphRange->startPosition(), m_range->startPosition());
+ RefPtr<Range> offsetAsRange = Range::create(paragraphRange->startContainer()->document(), paragraphRange->startPosition(), m_range->startPosition());
int rangeStartOffset = TextIterator::rangeLength(offsetAsRange.get());
int totalLengthProcessed = 0;
@@ -334,7 +330,7 @@
if (inSameParagraph(paragraphRange->startPosition(), m_range->endPosition())) {
// Determine the character offset from the end of the original search range to the end of the paragraph,
// since we will want to ignore results in this area.
- RefPtr<Range> endOffsetAsRange = Range::create(paragraphRange->startContainer(ec)->document(), paragraphRange->startPosition(), m_range->endPosition());
+ RefPtr<Range> endOffsetAsRange = Range::create(paragraphRange->startContainer()->document(), paragraphRange->startPosition(), m_range->endPosition());
currentEndOffset = TextIterator::rangeLength(endOffsetAsRange.get());
lastIteration = true;
}
@@ -387,7 +383,7 @@
if (!misspelledWord.isEmpty() && (!checkGrammar || badGrammarPhrase.isEmpty() || spellingLocation <= grammarDetailLocation)) {
int spellingOffset = spellingLocation - currentStartOffset;
if (!firstIteration) {
- RefPtr<Range> paragraphOffsetAsRange = Range::create(paragraphRange->startContainer(ec)->document(), m_range->startPosition(), paragraphRange->startPosition());
+ RefPtr<Range> paragraphOffsetAsRange = Range::create(paragraphRange->startContainer()->document(), m_range->startPosition(), paragraphRange->startPosition());
spellingOffset += TextIterator::rangeLength(paragraphOffsetAsRange.get());
}
outIsSpelling = true;
@@ -398,7 +394,7 @@
if (checkGrammar && !badGrammarPhrase.isEmpty()) {
int grammarPhraseOffset = grammarPhraseLocation - currentStartOffset;
if (!firstIteration) {
- RefPtr<Range> paragraphOffsetAsRange = Range::create(paragraphRange->startContainer(ec)->document(), m_range->startPosition(), paragraphRange->startPosition());
+ RefPtr<Range> paragraphOffsetAsRange = Range::create(paragraphRange->startContainer()->document(), m_range->startPosition(), paragraphRange->startPosition());
grammarPhraseOffset += TextIterator::rangeLength(paragraphOffsetAsRange.get());
}
outIsSpelling = false;
@@ -442,9 +438,7 @@
if (markAll) {
RefPtr<Range> badGrammarRange = TextIterator::subrange(m_range.get(), badGrammarPhraseLocation - startOffset + detail->location, detail->length);
- ExceptionCode ec = 0;
- badGrammarRange->startContainer(ec)->document()->markers()->addMarker(badGrammarRange.get(), DocumentMarker::Grammar, detail->userDescription);
- ASSERT(!ec);
+ badGrammarRange->startContainer()->document()->markers()->addMarker(badGrammarRange.get(), DocumentMarker::Grammar, detail->userDescription);
}
// Remember this detail only if it's earlier than our current candidate (the details aren't in a guaranteed order)
Modified: trunk/Source/WebCore/editing/markup.cpp (141876 => 141877)
--- trunk/Source/WebCore/editing/markup.cpp 2013-02-05 10:10:18 UTC (rev 141876)
+++ trunk/Source/WebCore/editing/markup.cpp 2013-02-05 10:13:50 UTC (rev 141877)
@@ -254,15 +254,14 @@
if (!node->isTextNode())
return String();
- ExceptionCode ec;
const Text* textNode = static_cast<const Text*>(node);
unsigned startOffset = 0;
unsigned endOffset = textNode->length();
- if (range && node == range->startContainer(ec))
- startOffset = range->startOffset(ec);
- if (range && node == range->endContainer(ec))
- endOffset = range->endOffset(ec);
+ if (range && node == range->startContainer())
+ startOffset = range->startOffset();
+ if (range && node == range->endContainer())
+ endOffset = range->endOffset();
Position start = createLegacyEditingPosition(const_cast<Node*>(node), startOffset);
Position end = createLegacyEditingPosition(const_cast<Node*>(node), endOffset);
@@ -275,11 +274,10 @@
return node->nodeValue();
String str = node->nodeValue();
- ExceptionCode ec;
- if (node == range->endContainer(ec))
- str.truncate(range->endOffset(ec));
- if (node == range->startContainer(ec))
- str.remove(0, range->startOffset(ec));
+ if (node == range->endContainer())
+ str.truncate(range->endOffset());
+ if (node == range->startContainer())
+ str.remove(0, range->startOffset());
return str;
}
Modified: trunk/Source/WebCore/editing/visible_units.cpp (141876 => 141877)
--- trunk/Source/WebCore/editing/visible_units.cpp 2013-02-05 10:10:18 UTC (rev 141876)
+++ trunk/Source/WebCore/editing/visible_units.cpp 2013-02-05 10:13:50 UTC (rev 141877)
@@ -513,7 +513,7 @@
if (!next)
return VisiblePosition(it.atEnd() ? it.range()->startPosition() : pos, DOWNSTREAM);
- Node* node = it.range()->startContainer(ec);
+ Node* node = it.range()->startContainer();
if ((node->isTextNode() && static_cast<int>(next) <= node->maxCharacterOffset()) || (node->renderer() && node->renderer()->isBR() && !next))
// The next variable contains a usable index into a text node
return VisiblePosition(createLegacyEditingPosition(node, next), DOWNSTREAM);
Modified: trunk/Source/WebCore/page/DOMSelection.cpp (141876 => 141877)
--- trunk/Source/WebCore/page/DOMSelection.cpp 2013-02-05 10:10:18 UTC (rev 141876)
+++ trunk/Source/WebCore/page/DOMSelection.cpp 2013-02-05 10:13:50 UTC (rev 141877)
@@ -442,7 +442,7 @@
selectedRange->deleteContents(ec);
ASSERT(!ec);
- setBaseAndExtent(selectedRange->startContainer(ec), selectedRange->startOffset(ec), selectedRange->startContainer(ec), selectedRange->startOffset(ec), ec);
+ setBaseAndExtent(selectedRange->startContainer(ec), selectedRange->startOffset(), selectedRange->startContainer(), selectedRange->startOffset(), ec);
ASSERT(!ec);
}
@@ -464,14 +464,14 @@
return false;
ExceptionCode ec = 0;
- bool nodeFullySelected = Range::compareBoundaryPoints(parentNode, nodeIndex, selectedRange->startContainer(ec), selectedRange->startOffset(ec), ec) >= 0 && !ec
- && Range::compareBoundaryPoints(parentNode, nodeIndex + 1, selectedRange->endContainer(ec), selectedRange->endOffset(ec), ec) <= 0 && !ec;
+ bool nodeFullySelected = Range::compareBoundaryPoints(parentNode, nodeIndex, selectedRange->startContainer(), selectedRange->startOffset(), ec) >= 0 && !ec
+ && Range::compareBoundaryPoints(parentNode, nodeIndex + 1, selectedRange->endContainer(), selectedRange->endOffset(), ec) <= 0 && !ec;
ASSERT(!ec);
if (nodeFullySelected)
return true;
- bool nodeFullyUnselected = (Range::compareBoundaryPoints(parentNode, nodeIndex, selectedRange->endContainer(ec), selectedRange->endOffset(ec), ec) > 0 && !ec)
- || (Range::compareBoundaryPoints(parentNode, nodeIndex + 1, selectedRange->startContainer(ec), selectedRange->startOffset(ec), ec) < 0 && !ec);
+ bool nodeFullyUnselected = (Range::compareBoundaryPoints(parentNode, nodeIndex, selectedRange->endContainer(), selectedRange->endOffset(), ec) > 0 && !ec)
+ || (Range::compareBoundaryPoints(parentNode, nodeIndex + 1, selectedRange->startContainer(), selectedRange->startOffset(), ec) < 0 && !ec);
ASSERT(!ec);
if (nodeFullyUnselected)
return false;
Modified: trunk/Source/WebCore/platform/chromium/PasteboardChromium.cpp (141876 => 141877)
--- trunk/Source/WebCore/platform/chromium/PasteboardChromium.cpp 2013-02-05 10:10:18 UTC (rev 141876)
+++ trunk/Source/WebCore/platform/chromium/PasteboardChromium.cpp 2013-02-05 10:13:50 UTC (rev 141877)
@@ -87,8 +87,7 @@
void Pasteboard::writeSelection(Range* selectedRange, bool canSmartCopyOrDelete, Frame* frame)
{
String html = createMarkup(selectedRange, 0, AnnotateForInterchange, false, ResolveNonLocalURLs);
- ExceptionCode ec = 0;
- KURL url = ""
+ KURL url = ""
String plainText = frame->editor()->selectedText();
#if OS(WINDOWS)
replaceNewlinesWithWindowsStyleNewlines(plainText);
Modified: trunk/Source/WebCore/platform/mac/HTMLConverter.mm (141876 => 141877)
--- trunk/Source/WebCore/platform/mac/HTMLConverter.mm 2013-02-05 10:10:18 UTC (rev 141876)
+++ trunk/Source/WebCore/platform/mac/HTMLConverter.mm 2013-02-05 10:13:50 UTC (rev 141877)
@@ -1674,11 +1674,10 @@
for (TextIterator it(range); !it.atEnd(); it.advance()) {
RefPtr<Range> currentTextRange = it.range();
- ExceptionCode ec = 0;
- Node* startContainer = currentTextRange->startContainer(ec);
- Node* endContainer = currentTextRange->endContainer(ec);
- int startOffset = currentTextRange->startOffset(ec);
- int endOffset = currentTextRange->endOffset(ec);
+ Node* startContainer = currentTextRange->startContainer();
+ Node* endContainer = currentTextRange->endContainer();
+ int startOffset = currentTextRange->startOffset();
+ int endOffset = currentTextRange->endOffset();
if (startContainer == endContainer && (startOffset == endOffset - 1)) {
Node* node = startContainer->childNode(startOffset);
Modified: trunk/Source/WebCore/platform/win/ClipboardWin.cpp (141876 => 141877)
--- trunk/Source/WebCore/platform/win/ClipboardWin.cpp 2013-02-05 10:10:18 UTC (rev 141876)
+++ trunk/Source/WebCore/platform/win/ClipboardWin.cpp 2013-02-05 10:13:50 UTC (rev 141877)
@@ -739,11 +739,10 @@
STGMEDIUM medium = {0};
medium.tymed = TYMED_HGLOBAL;
- ExceptionCode ec = 0;
Vector<char> data;
markupToCFHTML(createMarkup(selectedRange, 0, AnnotateForInterchange),
- selectedRange->startContainer(ec)->document()->url().string(), data);
+ selectedRange->startContainer()->document()->url().string(), data);
medium.hGlobal = createGlobalData(data);
if (medium.hGlobal && FAILED(m_writableDataObject->SetData(htmlFormat(), &medium, TRUE)))
::GlobalFree(medium.hGlobal);
Modified: trunk/Source/WebCore/platform/win/PasteboardWin.cpp (141876 => 141877)
--- trunk/Source/WebCore/platform/win/PasteboardWin.cpp 2013-02-05 10:10:18 UTC (rev 141876)
+++ trunk/Source/WebCore/platform/win/PasteboardWin.cpp 2013-02-05 10:13:50 UTC (rev 141877)
@@ -118,10 +118,9 @@
// Put CF_HTML format on the pasteboard
if (::OpenClipboard(m_owner)) {
- ExceptionCode ec = 0;
Vector<char> data;
markupToCFHTML(createMarkup(selectedRange, 0, AnnotateForInterchange),
- selectedRange->startContainer(ec)->document()->url().string(), data);
+ selectedRange->startContainer()->document()->url().string(), data);
HGLOBAL cbData = createGlobalData(data);
if (!::SetClipboardData(HTMLClipboardFormat, cbData))
::GlobalFree(cbData);
Modified: trunk/Source/WebCore/platform/wince/PasteboardWinCE.cpp (141876 => 141877)
--- trunk/Source/WebCore/platform/wince/PasteboardWinCE.cpp 2013-02-05 10:10:18 UTC (rev 141876)
+++ trunk/Source/WebCore/platform/wince/PasteboardWinCE.cpp 2013-02-05 10:13:50 UTC (rev 141877)
@@ -115,9 +115,8 @@
// Put CF_HTML format on the pasteboard
if (::OpenClipboard(m_owner)) {
- ExceptionCode ec = 0;
Vector<char> data;
- markupToCF_HTML(createMarkup(selectedRange, 0, AnnotateForInterchange), selectedRange->startContainer(ec)->document()->url(), data);
+ markupToCF_HTML(createMarkup(selectedRange, 0, AnnotateForInterchange), selectedRange->startContainer()->document()->url(), data);
HGLOBAL cbData = createGlobalData(data);
if (!::SetClipboardData(HTMLClipboardFormat, cbData))
::GlobalFree(cbData);
