Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (182363 => 182364)
--- trunk/Source/_javascript_Core/ChangeLog 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-04-05 20:17:11 UTC (rev 182364)
@@ -1,3 +1,16 @@
+2015-04-05 Simon Fraser <simon.fra...@apple.com>
+
+ Remove "go ahead and" from comments
+ https://bugs.webkit.org/show_bug.cgi?id=143421
+
+ Reviewed by Darin Adler, Benjamin Poulain.
+
+ Remove the phrase "go ahead and" from comments where it doesn't add
+ anything (which is almost all of them).
+
+ * interpreter/JSStack.cpp:
+ (JSC::JSStack::growSlowCase):
+
2015-04-04 Andreas Kling <akl...@apple.com>
Logically empty WeakBlocks should not pin down their MarkedBlocks indefinitely.
Modified: trunk/Source/_javascript_Core/interpreter/JSStack.cpp (182363 => 182364)
--- trunk/Source/_javascript_Core/interpreter/JSStack.cpp 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/_javascript_Core/interpreter/JSStack.cpp 2015-04-05 20:17:11 UTC (rev 182364)
@@ -97,8 +97,7 @@
if (newCommitTop < reservationTop())
return false;
- // Otherwise, the growth is still within our budget. Go ahead and commit
- // it and return true.
+ // Otherwise, the growth is still within our budget. Commit it and return true.
m_reservation.commit(newCommitTop, delta);
addToCommittedByteCount(delta);
m_commitTop = newCommitTop;
Modified: trunk/Source/WebCore/ChangeLog (182363 => 182364)
--- trunk/Source/WebCore/ChangeLog 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebCore/ChangeLog 2015-04-05 20:17:11 UTC (rev 182364)
@@ -1,3 +1,87 @@
+2015-04-05 Simon Fraser <simon.fra...@apple.com>
+
+ Remove "go ahead and" from comments
+ https://bugs.webkit.org/show_bug.cgi?id=143421
+
+ Reviewed by Darin Adler, Benjamin Poulain.
+
+ Remove the phrase "go ahead and" from comments where it doesn't add
+ anything (which is almost all of them).
+
+ * Modules/webdatabase/DatabaseTracker.cpp:
+ (WebCore::DatabaseTracker::deleteOriginLockFor):
+ * css/CSSFontFaceSrcValue.cpp:
+ (WebCore::CSSFontFaceSrcValue::isSupportedFormat):
+ * css/CSSPrimitiveValue.h:
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::styleForKeyframe):
+ (WebCore::StyleResolver::styleForPage):
+ (WebCore::StyleResolver::applyMatchedProperties):
+ * editing/ApplyStyleCommand.cpp:
+ (WebCore::ApplyStyleCommand::pushDownInlineStyleAroundNode):
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::detachFromFrame):
+ * loader/cache/CachedImage.cpp:
+ (WebCore::CachedImage::addIncrementalDataBuffer):
+ * loader/icon/IconDatabase.cpp:
+ (WebCore::IconDatabase::performURLImport):
+ * page/PageOverlay.cpp:
+ (WebCore::PageOverlay::fadeAnimationTimerFired):
+ * platform/ScrollView.cpp:
+ (WebCore::ScrollView::updateScrollbars):
+ (WebCore::ScrollView::scrollContents):
+ * platform/graphics/DisplayRefreshMonitor.cpp:
+ (WebCore::DisplayRefreshMonitor::create):
+ * platform/graphics/GraphicsContext.cpp:
+ * platform/graphics/mac/ComplexTextController.cpp:
+ (WebCore::ComplexTextController::adjustGlyphsAndAdvances):
+ * platform/network/HTTPParsers.cpp:
+ (WebCore::parseHTTPRefresh):
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::removeChild):
+ (WebCore::RenderBlock::layoutPositionedObjects):
+ (WebCore::RenderBlock::selectionGaps):
+ (WebCore::RenderBlock::blockSelectionGaps):
+ (WebCore::RenderBlock::absoluteRects):
+ (WebCore::RenderBlock::absoluteQuads):
+ (WebCore::RenderBlock::addFocusRingRects):
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::layoutBlockChild):
+ (WebCore::RenderBlockFlow::handleAfterSideOfBlock):
+ (WebCore::RenderBlockFlow::adjustBlockChildForPagination):
+ (WebCore::RenderBlockFlow::insertFloatingObject):
+ (WebCore::RenderBlockFlow::addOverhangingFloats):
+ (WebCore::RenderBlockFlow::inlineSelectionGaps):
+ (WebCore::RenderBlockFlow::computeInlinePreferredLogicalWidths):
+ * rendering/RenderBlockLineLayout.cpp:
+ (WebCore::RenderBlockFlow::appendRunsForObject):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::positionLineBox):
+ (WebCore::RenderBox::sizesLogicalWidthToFitContent):
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::RenderBoxModelObject::paintFillLayerExtended):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::updateLayerPositions):
+ (WebCore::RenderLayer::hitTestLayer):
+ (WebCore::RenderLayer::calculateClipRects):
+ * rendering/RenderLayerModelObject.cpp:
+ (WebCore::RenderLayerModelObject::styleWillChange):
+ * rendering/RenderLineBoxList.cpp:
+ (WebCore::RenderLineBoxList::dirtyLinesFromChangedChild):
+ * rendering/RenderTextLineBoxes.cpp:
+ (WebCore::RenderTextLineBoxes::dirtyRange):
+ * rendering/line/BreakingContext.h:
+ (WebCore::BreakingContext::handleOutOfFlowPositioned):
+ (WebCore::BreakingContext::handleText):
+ * rendering/line/LineBreaker.cpp:
+ (WebCore::LineBreaker::nextLineBreak):
+ * style/StyleResolveTree.cpp:
+ (WebCore::Style::resolveLocal):
+ * xml/XMLHttpRequestProgressEventThrottle.cpp:
+ (WebCore::XMLHttpRequestProgressEventThrottle::dispatchThrottledProgressEvent):
+ * xml/parser/XMLDocumentParser.cpp:
+ (WebCore::XMLDocumentParser::append):
+
2015-04-04 Andy Estes <aes...@apple.com>
[Content Filtering] Blocked page is not always displayed when it should be
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp (182363 => 182364)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp 2015-04-05 20:17:11 UTC (rev 182364)
@@ -684,8 +684,7 @@
// files in this origin. We'll give the OriginLock one chance to do an
// orderly clean up first when we remove its ref from the m_originLockMap.
// This may or may not be possible depending on whether other threads are
- // also using the OriginLock at the same time. After that, we will go ahead
- // and delete the lock file.
+ // also using the OriginLock at the same time. After that, we will delete the lock file.
m_originLockMap.remove(origin->databaseIdentifier());
OriginLock::deleteLockFile(originPath(origin));
Modified: trunk/Source/WebCore/css/CSSFontFaceSrcValue.cpp (182363 => 182364)
--- trunk/Source/WebCore/css/CSSFontFaceSrcValue.cpp 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebCore/css/CSSFontFaceSrcValue.cpp 2015-04-05 20:17:11 UTC (rev 182364)
@@ -53,7 +53,7 @@
bool CSSFontFaceSrcValue::isSupportedFormat() const
{
// Normally we would just check the format, but in order to avoid conflicts with the old WinIE style of font-face,
- // we will also check to see if the URL ends with .eot. If so, we'll go ahead and assume that we shouldn't load it.
+ // we will also check to see if the URL ends with .eot. If so, we'll assume that we shouldn't load it.
if (m_format.isEmpty()) {
// Check for .eot.
if (!m_resource.startsWith("data:", false) && m_resource.endsWith(".eot", false))
Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.h (182363 => 182364)
--- trunk/Source/WebCore/css/CSSPrimitiveValue.h 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.h 2015-04-05 20:17:11 UTC (rev 182364)
@@ -59,8 +59,7 @@
const int minValueForCssLength = intMinForLayoutUnit + 2;
// Dimension calculations are imprecise, often resulting in values of e.g.
-// 44.99998. We need to go ahead and round if we're really close to the next
-// integer value.
+// 44.99998. We need to round if we're really close to the next integer value.
template<typename T> inline T roundForImpreciseConversion(double value)
{
value += (value < 0) ? -0.01 : +0.01;
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (182363 => 182364)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2015-04-05 20:17:11 UTC (rev 182364)
@@ -868,14 +868,13 @@
applyCascadedProperties(cascade, firstCSSProperty, lastHighPriorityProperty);
- // If our font got dirtied, go ahead and update it now.
+ // If our font got dirtied, update it now.
updateFont();
// Now do rest of the properties.
applyCascadedProperties(cascade, firstLowPriorityProperty, lastCSSProperty);
- // If our font got dirtied by one of the non-essential font props,
- // go ahead and update it a second time.
+ // If our font got dirtied by one of the non-essential font props, update it a second time.
updateFont();
cascade.applyDeferredProperties(*this);
@@ -1034,7 +1033,7 @@
applyCascadedProperties(cascade, firstCSSProperty, lastHighPriorityProperty);
- // If our font got dirtied, go ahead and update it now.
+ // If our font got dirtied, update it now.
updateFont();
applyCascadedProperties(cascade, firstLowPriorityProperty, lastCSSProperty);
@@ -1790,7 +1789,7 @@
if (cacheItem && cacheItem->renderStyle->effectiveZoom() != state.style()->effectiveZoom())
return applyMatchedProperties(matchResult, element, DoNotUseMatchedPropertiesCache);
- // If our font got dirtied, go ahead and update it now.
+ // If our font got dirtied, update it now.
updateFont();
// If the font changed, we can't use the matched properties cache. Start over.
Modified: trunk/Source/WebCore/editing/ApplyStyleCommand.cpp (182363 => 182364)
--- trunk/Source/WebCore/editing/ApplyStyleCommand.cpp 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebCore/editing/ApplyStyleCommand.cpp 2015-04-05 20:17:11 UTC (rev 182364)
@@ -1065,7 +1065,7 @@
}
// Apply style to all nodes containing targetNode and their siblings but NOT to targetNode
- // But if we've removed styledElement then go ahead and always apply the style.
+ // But if we've removed styledElement then always apply the style.
if (&child != targetNode || styledElement)
applyInlineStyleToPushDown(&child, styleToPushDown.get());
Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (182363 => 182364)
--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2015-04-05 20:17:11 UTC (rev 182364)
@@ -906,7 +906,7 @@
Ref<DocumentLoader> protectLoader(*this);
// It never makes sense to have a document loader that is detached from its
- // frame have any loads active, so go ahead and kill all the loads.
+ // frame have any loads active, so kill all the loads.
stopLoading();
if (m_mainResource && m_mainResource->hasClient(this))
m_mainResource->removeClient(this);
Modified: trunk/Source/WebCore/loader/cache/CachedImage.cpp (182363 => 182364)
--- trunk/Source/WebCore/loader/cache/CachedImage.cpp 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebCore/loader/cache/CachedImage.cpp 2015-04-05 20:17:11 UTC (rev 182364)
@@ -390,9 +390,8 @@
return;
}
- // Go ahead and tell our observers to try to draw.
- // Each chunk from the network causes observers to repaint, which will
- // force that chunk to decode.
+ // Tell our observers to try to draw.
+ // Each chunk from the network causes observers to repaint, which will force that chunk to decode.
// It would be nice to only redraw the decoded band of the image, but with the current design
// (decoding delayed until painting) that seems hard.
notifyObservers();
Modified: trunk/Source/WebCore/loader/icon/IconDatabase.cpp (182363 => 182364)
--- trunk/Source/WebCore/loader/icon/IconDatabase.cpp 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebCore/loader/icon/IconDatabase.cpp 2015-04-05 20:17:11 UTC (rev 182364)
@@ -1221,7 +1221,7 @@
// If the pageRecord doesn't exist in this map, then no one has retained this pageURL
// If the s_databaseCleanupCounter count is non-zero, then we're not supposed to be pruning the database in any manner,
- // so go ahead and actually create a pageURLRecord for this url even though it's not retained.
+ // so actually create a pageURLRecord for this url even though it's not retained.
// If database cleanup *is* allowed, we don't want to bother pulling in a page url from disk that noone is actually interested
// in - we'll prune it later instead!
if (!pageRecord && databaseCleanupCounter && documentCanHaveIcon(pageURL)) {
Modified: trunk/Source/WebCore/page/PageOverlay.cpp (182363 => 182364)
--- trunk/Source/WebCore/page/PageOverlay.cpp 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebCore/page/PageOverlay.cpp 2015-04-05 20:17:11 UTC (rev 182364)
@@ -251,7 +251,7 @@
bool wasFadingOut = m_fadeAnimationType == FadeOutAnimation;
m_fadeAnimationType = NoAnimation;
- // If this was a fade out, go ahead and uninstall the page overlay.
+ // If this was a fade out, uninstall the page overlay.
if (wasFadingOut)
controller()->uninstallPageOverlay(this, PageOverlay::FadeMode::DoNotFade);
}
Modified: trunk/Source/WebCore/platform/ScrollView.cpp (182363 => 182364)
--- trunk/Source/WebCore/platform/ScrollView.cpp 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebCore/platform/ScrollView.cpp 2015-04-05 20:17:11 UTC (rev 182364)
@@ -604,8 +604,8 @@
bool hasOverlayScrollbars = (!m_horizontalScrollbar || m_horizontalScrollbar->isOverlayScrollbar()) && (!m_verticalScrollbar || m_verticalScrollbar->isOverlayScrollbar());
- // If we came in here with the view already needing a layout, then go ahead and do that
- // first. (This will be the common case, e.g., when the page changes due to window resizing for example).
+ // If we came in here with the view already needing a layout then do that first.
+ // (This will be the common case, e.g., when the page changes due to window resizing for example).
// This layout will not re-enter updateScrollbars and does not count towards our max layout pass total.
if (!m_scrollbarsSuppressed && !hasOverlayScrollbars) {
m_inUpdateScrollbars = true;
@@ -839,9 +839,8 @@
if (!scrollContentsFastPath(-scrollDelta, scrollViewRect, clipRect))
scrollContentsSlowPath(updateRect);
} else {
- // We need to go ahead and repaint the entire backing store. Do it now before moving the
- // windowed plugins.
- scrollContentsSlowPath(updateRect);
+ // We need to repaint the entire backing store. Do it now before moving the windowed plugins.
+ scrollContentsSlowPath(updateRect);
}
// Invalidate the overhang areas if they are visible.
Modified: trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp (182363 => 182364)
--- trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp 2015-04-05 20:17:11 UTC (rev 182364)
@@ -42,7 +42,7 @@
if (Optional<RefPtr<DisplayRefreshMonitor>> monitor = client->createDisplayRefreshMonitor(displayID))
return monitor.value();
- // If ChromeClient returned Nullopt, we'll go ahead and make one of the default type.
+ // If ChromeClient returned Nullopt, we'll make one of the default type.
#if PLATFORM(MAC)
return DisplayRefreshMonitorMac::create(displayID);
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp (182363 => 182364)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2015-04-05 20:17:11 UTC (rev 182364)
@@ -562,8 +562,7 @@
}
#if !USE(CG)
-// Implement this if you want to go ahead and push the drawing mode into your native context
-// immediately.
+// Implement this if you want to go push the drawing mode into your native context immediately.
void GraphicsContext::setPlatformTextDrawingMode(TextDrawingModeFlags)
{
}
Modified: trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp (182363 => 182364)
--- trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp 2015-04-05 20:17:11 UTC (rev 182364)
@@ -689,7 +689,7 @@
advance.width = font.adjustedSpaceWidth();
if (hasExtraSpacing) {
- // If we're a glyph with an advance, go ahead and add in letter-spacing.
+ // If we're a glyph with an advance, add in letter-spacing.
// That way we weed out zero width lurkers. This behavior matches the fast text code path.
if (advance.width)
advance.width += m_font.letterSpacing();
Modified: trunk/Source/WebCore/platform/network/HTTPParsers.cpp (182363 => 182364)
--- trunk/Source/WebCore/platform/network/HTTPParsers.cpp 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebCore/platform/network/HTTPParsers.cpp 2015-04-05 20:17:11 UTC (rev 182364)
@@ -223,7 +223,7 @@
// https://bugs.webkit.org/show_bug.cgi?id=27868
// Sometimes there is no closing quote for the end of the URL even though there was an opening quote.
- // If we looped over the entire alleged URL string back to the opening quote, just go ahead and use everything
+ // If we looped over the entire alleged URL string back to the opening quote, just use everything
// after the opening quote instead.
if (urlEndPos == urlStartPos)
urlEndPos = len;
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (182363 => 182364)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2015-04-05 20:17:11 UTC (rev 182364)
@@ -691,9 +691,8 @@
return;
}
- // If this child is a block, and if our previous and next siblings are
- // both anonymous blocks with inline content, then we can go ahead and
- // fold the inline content back together.
+ // If this child is a block, and if our previous and next siblings are both anonymous blocks
+ // with inline content, then we can fold the inline content back together.
RenderObject* prev = oldChild.previousSibling();
RenderObject* next = oldChild.nextSibling();
bool canMergeAnonymousBlocks = canMergeContiguousAnonymousBlocks(oldChild, prev, next);
@@ -747,8 +746,7 @@
RenderObject* child = prev ? prev : next;
if (canMergeAnonymousBlocks && child && !child->previousSibling() && !child->nextSibling() && canCollapseAnonymousBlockChild()) {
// The removal has knocked us down to containing only a single anonymous
- // box. We can go ahead and pull the content right back up into our
- // box.
+ // box. We can pull the content right back up into our box.
collapseAnonymousBoxChild(*this, downcast<RenderBlock>(child));
} else if (((prev && prev->isAnonymousBlock()) || (next && next->isAnonymousBlock())) && canCollapseAnonymousBlockChild()) {
// It's possible that the removal has knocked us down to a single anonymous
@@ -1331,7 +1329,7 @@
if (r.needsPositionedMovementLayoutOnly() && r.tryLayoutDoingPositionedMovementOnly())
r.clearNeedsLayout();
- // If we are paginated or in a line grid, go ahead and compute a vertical position for our object now.
+ // If we are paginated or in a line grid, compute a vertical position for our object now.
// If it's wrong we'll lay out again.
LayoutUnit oldLogicalTop = 0;
bool needsBlockDirectionLocationSetBeforeLayout = r.needsLayout() && view().layoutState()->needsBlockDirectionLocationSetBeforeLayout();
@@ -1860,7 +1858,7 @@
else
result = blockSelectionGaps(rootBlock, rootBlockPhysicalPosition, offsetFromRootBlock, lastLogicalTop, lastLogicalLeft, lastLogicalRight, cache, paintInfo);
- // Go ahead and fill the vertical gap all the way to the bottom of our block if the selection extends past our block.
+ // Fill the vertical gap all the way to the bottom of our block if the selection extends past our block.
if (&rootBlock == this && (selectionState() != SelectionBoth && selectionState() != SelectionEnd) && !isRubyBase() && !isRubyText()) {
result.uniteCenter(blockSelectionGap(rootBlock, rootBlockPhysicalPosition, offsetFromRootBlock,
lastLogicalTop, lastLogicalLeft, lastLogicalRight, logicalHeight(), cache, paintInfo));
@@ -1880,7 +1878,7 @@
{
GapRects result;
- // Go ahead and jump right to the first block child that contains some selected objects.
+ // Jump right to the first block child that contains some selected objects.
RenderBox* curr;
for (curr = firstChildBox(); curr && curr->selectionState() == SelectionNone; curr = curr->nextSiblingBox()) { }
@@ -1936,7 +1934,7 @@
lastLogicalLeft = logicalLeftSelectionOffset(rootBlock, curr->logicalBottom(), cache);
lastLogicalRight = logicalRightSelectionOffset(rootBlock, curr->logicalBottom(), cache);
} else if (childState != SelectionNone && is<RenderBlock>(*curr)) {
- // We must be a block that has some selected object inside it. Go ahead and recur.
+ // We must be a block that has some selected object inside it, so recur.
result.unite(downcast<RenderBlock>(*curr).selectionGaps(rootBlock, rootBlockPhysicalPosition, LayoutSize(offsetFromRootBlock.width() + curr->x(), offsetFromRootBlock.height() + curr->y()),
lastLogicalTop, lastLogicalLeft, lastLogicalRight, childCache, paintInfo));
}
@@ -3312,9 +3310,8 @@
void RenderBlock::absoluteRects(Vector<IntRect>& rects, const LayoutPoint& accumulatedOffset) const
{
- // For blocks inside inlines, we go ahead and include margins so that we run right up to the
- // inline boxes above and below us (thus getting merged with them to form a single irregular
- // shape).
+ // For blocks inside inlines, we include margins so that we run right up to the inline boxes
+ // above and below us (thus getting merged with them to form a single irregular shape).
if (isAnonymousBlockContinuation()) {
// FIXME: This is wrong for block-flows that are horizontal.
// https://bugs.webkit.org/show_bug.cgi?id=46781
@@ -3328,9 +3325,8 @@
void RenderBlock::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed) const
{
- // For blocks inside inlines, we go ahead and include margins so that we run right up to the
- // inline boxes above and below us (thus getting merged with them to form a single irregular
- // shape).
+ // For blocks inside inlines, we include margins so that we run right up to the inline boxes
+ // above and below us (thus getting merged with them to form a single irregular shape).
FloatRect localRect = isAnonymousBlockContinuation()
? FloatRect(0, -collapsedMarginBefore(), width(), height() + collapsedMarginBefore() + collapsedMarginAfter())
: FloatRect(0, 0, width(), height());
@@ -3413,9 +3409,8 @@
void RenderBlock::addFocusRingRects(Vector<IntRect>& rects, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer)
{
- // For blocks inside inlines, we go ahead and include margins so that we run right up to the
- // inline boxes above and below us (thus getting merged with them to form a single irregular
- // shape).
+ // For blocks inside inlines, we include margins so that we run right up to the inline boxes
+ // above and below us (thus getting merged with them to form a single irregular shape).
if (inlineElementContinuation()) {
// FIXME: This check really isn't accurate.
bool nextInlineHasLineBox = inlineElementContinuation()->firstLineBox();
Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (182363 => 182364)
--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2015-04-05 20:17:11 UTC (rev 182364)
@@ -671,7 +671,7 @@
#if !ASSERT_DISABLED
LayoutSize oldLayoutDelta = view().layoutDelta();
#endif
- // Go ahead and position the child as though it didn't collapse with the top.
+ // Position the child as though it didn't collapse with the top.
setLogicalTopForChild(child, logicalTopEstimate, ApplyLayoutDelta);
estimateRegionRangeForBoxChild(child);
@@ -728,10 +728,8 @@
// when collapseMargins dynamically adds overhanging floats because of a child with negative margins.
if (logicalTopAfterClear != logicalTopEstimate || child.needsLayout() || (paginated && childBlockFlow && childBlockFlow->shouldBreakAtLineToAvoidWidow())) {
if (child.shrinkToAvoidFloats()) {
- // The child's width depends on the line width.
- // When the child shifts to clear an item, its width can
- // change (because it has more available line width).
- // So go ahead and mark the item as dirty.
+ // The child's width depends on the line width. When the child shifts to clear an item, its width can
+ // change (because it has more available line width). So mark the item as dirty.
child.setChildNeedsLayout(MarkOnlyThis);
}
@@ -1312,7 +1310,7 @@
if (is<RenderBlockFlow>(lastBlock) && downcast<RenderBlockFlow>(*lastBlock).isSelfCollapsingBlock())
setLogicalHeight(logicalHeight() - downcast<RenderBlockFlow>(*lastBlock).marginOffsetForSelfCollapsingBlock());
- // If we can't collapse with children then go ahead and add in the bottom margin.
+ // If we can't collapse with children then add in the bottom margin.
if (!marginInfo.discardMargin() && (!marginInfo.canCollapseWithMarginAfter() && !marginInfo.canCollapseWithMarginBefore()
&& (!document().inQuirksMode() || !marginInfo.quirkContainer() || !marginInfo.hasMarginAfterQuirk())))
setLogicalHeight(logicalHeight() + marginInfo.margin());
@@ -1526,10 +1524,8 @@
setLogicalTopForChild(child, logicalTopAfterClear, ApplyLayoutDelta);
if (child.shrinkToAvoidFloats()) {
- // The child's width depends on the line width.
- // When the child shifts to clear an item, its width can
- // change (because it has more available line width).
- // So go ahead and mark the item as dirty.
+ // The child's width depends on the line width. When the child shifts to clear an item, its width can
+ // change (because it has more available line width). So mark the item as dirty.
child.setChildNeedsLayout(MarkOnlyThis);
}
@@ -1588,7 +1584,7 @@
result += paginationStrut;
}
- // Similar to how we apply clearance. Go ahead and boost height() to be the place where we're going to position the child.
+ // Similar to how we apply clearance. Boost height() to be the place where we're going to position the child.
setLogicalHeight(logicalHeight() + (result - oldTop));
// Return the final adjusted logical top.
@@ -2231,8 +2227,7 @@
std::unique_ptr<FloatingObject> floatingObject = FloatingObject::create(floatBox);
- // Our location is irrelevant if we're unsplittable or no pagination is in effect.
- // Just go ahead and lay out the float.
+ // Our location is irrelevant if we're unsplittable or no pagination is in effect. Just lay out the float.
bool isChildRenderBlock = floatBox.isRenderBlock();
if (isChildRenderBlock && !floatBox.needsLayout() && view().layoutState()->pageLogicalHeightChanged())
floatBox.setChildNeedsLayout(MarkOnlyThis);
@@ -2662,8 +2657,7 @@
floatingObject->setShouldPaint(true);
}
- // Since the float doesn't overhang, it didn't get put into our list. We need to go ahead and add its overflow in to the
- // child now.
+ // Since the float doesn't overhang, it didn't get put into our list. We need to add its overflow in to the child now.
if (floatingObject->isDescendant())
child.addOverflowFromChild(&floatingObject->renderer(), LayoutSize(xPositionForFloatIncludingMargin(floatingObject), yPositionForFloatIncludingMargin(floatingObject)));
}
@@ -3057,8 +3051,7 @@
if (!hasLines()) {
if (containsStart) {
- // Go ahead and update our lastLogicalTop to be the bottom of the block. <hr>s or empty blocks with height can trip this
- // case.
+ // Update our lastLogicalTop to be the bottom of the block. <hr>s or empty blocks with height can trip this case.
lastLogicalTop = blockDirectionOffset(rootBlock, offsetFromRootBlock) + logicalHeight();
lastLogicalLeft = logicalLeftSelectionOffset(rootBlock, logicalHeight(), cache);
lastLogicalRight = logicalRightSelectionOffset(rootBlock, logicalHeight(), cache);
@@ -3094,7 +3087,7 @@
lastSelectedLine = lastRootBox();
if (lastSelectedLine && selectionState() != SelectionEnd && selectionState() != SelectionBoth) {
- // Go ahead and update our lastY to be the bottom of the last selected line.
+ // Update our lastY to be the bottom of the last selected line.
lastLogicalTop = blockDirectionOffset(rootBlock, offsetFromRootBlock) + lastSelectedLine->selectionBottom();
lastLogicalLeft = logicalLeftSelectionOffset(rootBlock, lastSelectedLine->selectionBottom(), cache);
lastLogicalRight = logicalRightSelectionOffset(rootBlock, lastSelectedLine->selectionBottom(), cache);
@@ -4030,10 +4023,9 @@
bool isAnonymousInlineBlock = child->isAnonymousInlineBlock();
if (!child->isBR()) {
- // Step One: determine whether or not we need to go ahead and
- // terminate our current line. Each discrete chunk can become
- // the new min-width, if it is the widest chunk seen so far, and
- // it can also become the max-width.
+ // Step One: determine whether or not we need to terminate our current line.
+ // Each discrete chunk can become the new min-width, if it is the widest chunk
+ // seen so far, and it can also become the max-width.
// Children fall into three categories:
// (1) An inline flow object. These objects always have a min/max of 0,
@@ -4042,8 +4034,8 @@
//
// (2) An inline non-text non-flow object, e.g., an inline replaced element.
// These objects can always be on a line by themselves, so in this situation
- // we need to go ahead and break the current line, and then add in our own
- // margins and min/max width on its own line, and then terminate the line.
+ // we need to break the current line, and then add in our own margins and min/max
+ // width on its own line, and then terminate the line.
//
// (3) A text object. Text runs can have breakable characters at the start,
// the middle or the end. They may also lose whitespace off the front if
@@ -4055,9 +4047,8 @@
// ends with whitespace.
// (c) the min/max width of the string (trimmed for whitespace).
//
- // If the text string starts with whitespace, then we need to go ahead and
- // terminate our current line (unless we're already in a whitespace stripping
- // mode.
+ // If the text string starts with whitespace, then we need to terminate our current line
+ // (unless we're already in a whitespace stripping mode.
//
// If the text string has a breakable character in the middle, but didn't start
// with whitespace, then we add the width of the first non-breakable run and
@@ -4103,8 +4094,7 @@
if (!is<RenderInline>(*child) && !is<RenderText>(*child)) {
// Case (2). Inline replaced elements and floats.
- // Go ahead and terminate the current line as far as
- // minwidth is concerned.
+ // Terminate the current line as far as minwidth is concerned.
childMin += child->minPreferredLogicalWidth().ceilToFloat();
childMax += child->maxPreferredLogicalWidth().ceilToFloat();
@@ -4240,7 +4230,7 @@
// We have a breakable character. Now we need to know if
// we start and end with whitespace.
if (beginWS) {
- // Go ahead and end the current line.
+ // End the current line.
minLogicalWidth = preferredWidth(minLogicalWidth, inlineMin);
} else {
inlineMin += beginMin;
@@ -4251,8 +4241,7 @@
inlineMin = childMin;
if (endWS) {
- // We end in whitespace, which means we can go ahead
- // and end our current line.
+ // We end in whitespace, which means we can end our current line.
minLogicalWidth = preferredWidth(minLogicalWidth, inlineMin);
inlineMin = 0;
shouldBreakLineAfterText = false;
Modified: trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp (182363 => 182364)
--- trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2015-04-05 20:17:11 UTC (rev 182364)
@@ -103,8 +103,7 @@
return;
}
- // An end midpoint has been encountered within our object. We
- // need to go ahead and append a run with our endpoint.
+ // An end midpoint has been encountered within our object. We need to append a run with our endpoint.
if (static_cast<int>(nextMidpoint.offset() + 1) <= end) {
lineMidpointState.setBetweenMidpoints(true);
lineMidpointState.incrementCurrentMidpoint();
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (182363 => 182364)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2015-04-05 20:17:11 UTC (rev 182364)
@@ -2082,7 +2082,7 @@
RootInlineBox& rootBox = box.root();
rootBox.blockFlow().setStaticInlinePositionForChild(*this, rootBox.lineTopWithLeading(), LayoutUnit::fromFloatRound(box.logicalLeft()));
if (style().hasStaticInlinePosition(box.isHorizontal()))
- setChildNeedsLayout(MarkOnlyThis); // Just go ahead and mark the positioned object as needing layout, so it will update its position properly.
+ setChildNeedsLayout(MarkOnlyThis); // Just mark the positioned object as needing layout, so it will update its position properly.
} else {
// Our object was a block originally, so we make our normal flow position be
// just below the line box (as though all the inlines that came before us got
@@ -2090,7 +2090,7 @@
// in flow). This value was cached in the y() of the box.
layer()->setStaticBlockPosition(box.logicalTop());
if (style().hasStaticBlockPosition(box.isHorizontal()))
- setChildNeedsLayout(MarkOnlyThis); // Just go ahead and mark the positioned object as needing layout, so it will update its position properly.
+ setChildNeedsLayout(MarkOnlyThis); // Just mark the positioned object as needing layout, so it will update its position properly.
}
// Nuke the box.
@@ -2488,8 +2488,8 @@
}
// Flexible box items should shrink wrap, so we lay them out at their intrinsic widths.
- // In the case of columns that have a stretch alignment, we go ahead and layout at the
- // stretched size to avoid an extra layout when applying alignment.
+ // In the case of columns that have a stretch alignment, we layout at the stretched size
+ // to avoid an extra layout when applying alignment.
if (parent()->isFlexibleBox()) {
// For multiline columns, we need to apply align-content first, so we can't stretch now.
if (!parent()->style().isColumnFlexDirection() || parent()->style().flexWrap() != FlexNoWrap)
Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (182363 => 182364)
--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2015-04-05 20:17:11 UTC (rev 182364)
@@ -813,7 +813,7 @@
if (!boxShadowShouldBeAppliedToBackground)
backgroundRect.intersect(paintInfo.rect);
- // If we have an alpha and we are painting the root element, go ahead and blend with the base background color.
+ // If we have an alpha and we are painting the root element, blend with the base background color.
Color baseColor;
bool shouldClearBackground = false;
if ((baseBgColorUsage != BaseBackgroundColorSkip) && isOpaqueRoot) {
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (182363 => 182364)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-04-05 20:17:11 UTC (rev 182364)
@@ -536,7 +536,7 @@
m_hasTransformedAncestor = flags & SeenTransformedLayer;
m_has3DTransformedAncestor = flags & Seen3DTransformedLayer;
- // Go ahead and update the reflection's position and size.
+ // Update the reflection's position and size.
if (m_reflection)
m_reflection->layout();
@@ -5006,7 +5006,7 @@
if (parent()) {
ClipRectsContext clipRectsContext(rootLayer, RootRelativeClipRects, IncludeOverlayScrollbarSize);
ClipRect clipRect = backgroundClipRect(clipRectsContext);
- // Go ahead and test the enclosing clip now.
+ // Test the enclosing clip now.
if (!clipRect.intersects(hitTestLocation))
return nullptr;
}
@@ -5603,15 +5603,14 @@
}
if (renderer().hasClip()) {
- // Clip applies to *us* as well, so go ahead and update the damageRect.
+ // Clip applies to *us* as well, so update the damageRect.
LayoutRect newPosClip = downcast<RenderBox>(renderer()).clipRect(toLayoutPoint(offsetFromRootLocal), namedFlowFragment);
backgroundRect.intersect(newPosClip);
foregroundRect.intersect(newPosClip);
outlineRect.intersect(newPosClip);
}
- // If we establish a clip at all, then go ahead and make sure our background
- // rect is intersected with our layer's bounds including our visual overflow,
+ // If we establish a clip at all, then make sure our background rect is intersected with our layer's bounds including our visual overflow,
// since any visual overflow like box-shadow or border-outset is not clipped by overflow:auto/hidden.
if (renderBox()->hasVisualOverflow()) {
// FIXME: Does not do the right thing with CSS regions yet, since we don't yet factor in the
@@ -5739,8 +5738,7 @@
if (damageRect.isEmpty())
return false;
- // If we aren't an inline flow, and our layer bounds do intersect the damage rect, then we
- // can go ahead and return true.
+ // If we aren't an inline flow, and our layer bounds do intersect the damage rect, then we can return true.
if (!renderer().isRenderInline()) {
LayoutRect b = layerBounds;
b.inflate(renderer().view().maximalOutlineSize());
Modified: trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp (182363 => 182364)
--- trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp 2015-04-05 20:17:11 UTC (rev 182364)
@@ -101,8 +101,7 @@
}
if (diff == StyleDifferenceLayout || diff == StyleDifferenceSimplifiedLayout) {
- // When a layout hint happens, we go ahead and do a repaint of the layer, since the layer could
- // end up being destroyed.
+ // When a layout hint happens, we do a repaint of the layer, since the layer could end up being destroyed.
if (hasLayer()) {
if (oldStyle->position() != newStyle.position()
|| oldStyle->zIndex() != newStyle.zIndex()
Modified: trunk/Source/WebCore/rendering/RenderLineBoxList.cpp (182363 => 182364)
--- trunk/Source/WebCore/rendering/RenderLineBoxList.cpp 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebCore/rendering/RenderLineBoxList.cpp 2015-04-05 20:17:11 UTC (rev 182364)
@@ -315,8 +315,7 @@
// If we have no first line box, then just bail early.
if (!firstBox) {
- // For an empty inline, go ahead and propagate the check up to our parent, unless the parent
- // is already dirty.
+ // For an empty inline, propagate the check up to our parent, unless the parent is already dirty.
if (container.isInline() && !container.ancestorLineBoxDirty()) {
container.parent()->dirtyLinesFromChangedChild(container);
container.setAncestorLineBoxDirty(); // Mark the container to avoid dirtying the same lines again across multiple destroy() calls of the same subtree.
Modified: trunk/Source/WebCore/rendering/RenderTextLineBoxes.cpp (182363 => 182364)
--- trunk/Source/WebCore/rendering/RenderTextLineBoxes.cpp 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebCore/rendering/RenderTextLineBoxes.cpp 2015-04-05 20:17:11 UTC (rev 182364)
@@ -633,8 +633,7 @@
if (!firstRootBox) {
firstRootBox = &rootBox;
if (!dirtiedLines) {
- // The affected area was in between two runs. Go ahead and mark the root box of
- // the run after the affected area as dirty.
+ // The affected area was in between two runs. Mark the root box of the run after the affected area as dirty.
firstRootBox->markDirty();
dirtiedLines = true;
}
Modified: trunk/Source/WebCore/rendering/line/BreakingContext.h (182363 => 182364)
--- trunk/Source/WebCore/rendering/line/BreakingContext.h 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebCore/rendering/line/BreakingContext.h 2015-04-05 20:17:11 UTC (rev 182364)
@@ -383,15 +383,13 @@
inline void BreakingContext::handleOutOfFlowPositioned(Vector<RenderBox*>& positionedObjects)
{
- // If our original display wasn't an inline type, then we can
- // go ahead and determine our static inline position now.
+ // If our original display wasn't an inline type, then we can determine our static inline position now.
auto& box = downcast<RenderBox>(*m_current.renderer());
bool isInlineType = box.style().isOriginalDisplayInlineType();
if (!isInlineType)
m_block.setStaticInlinePositionForChild(box, m_block.logicalHeight(), m_block.startOffsetForContent(m_block.logicalHeight()));
else {
- // If our original display was an INLINE type, then we can go ahead
- // and determine our static y position now.
+ // If our original display was an INLINE type, then we can determine our static y position now.
box.layer()->setStaticBlockPosition(m_block.logicalHeight());
}
@@ -920,9 +918,8 @@
}
if (!m_ignoringSpaces && m_currentStyle->collapseWhiteSpace()) {
- // If we encounter a newline, or if we encounter a
- // second space, we need to go ahead and break up this
- // run and enter a mode where we start collapsing spaces.
+ // If we encounter a newline, or if we encounter a second space,
+ // we need to break up this run and enter a mode where we start collapsing spaces.
if (m_currentCharacterIsSpace && previousCharacterIsSpace) {
m_ignoringSpaces = true;
Modified: trunk/Source/WebCore/rendering/line/LineBreaker.cpp (182363 => 182364)
--- trunk/Source/WebCore/rendering/line/LineBreaker.cpp 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebCore/rendering/line/LineBreaker.cpp 2015-04-05 20:17:11 UTC (rev 182364)
@@ -108,7 +108,7 @@
context.handleReplaced();
} else if (context.currentObject()->isText()) {
if (context.handleText(wordMeasurements, m_hyphenated, consecutiveHyphenatedLines)) {
- // We've hit a hard text line break. Our line break iterator is updated, so go ahead and early return.
+ // We've hit a hard text line break. Our line break iterator is updated, so early return.
return context.lineBreak();
}
} else if (context.currentObject()->isLineBreakOpportunity())
Modified: trunk/Source/WebCore/style/StyleResolveTree.cpp (182363 => 182364)
--- trunk/Source/WebCore/style/StyleResolveTree.cpp 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebCore/style/StyleResolveTree.cpp 2015-04-05 20:17:11 UTC (rev 182364)
@@ -771,7 +771,7 @@
}
}
- // If "rem" units are used anywhere in the document, and if the document element's font size changes, then go ahead and force font updating
+ // If "rem" units are used anywhere in the document, and if the document element's font size changes, then force font updating
// all the way down the tree. This is simpler than having to maintain a cache of objects (and such font size changes should be rare anyway).
if (document.styleSheetCollection().usesRemUnits() && document.documentElement() == ¤t && localChange != NoChange && currentStyle && newStyle && currentStyle->fontSize() != newStyle->fontSize()) {
// Cached RenderStyles may depend on the re units.
Modified: trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp (182363 => 182364)
--- trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp 2015-04-05 20:17:11 UTC (rev 182364)
@@ -66,8 +66,7 @@
}
if (!isActive()) {
- // The timer is not active so the least frequent event for now is every byte.
- // Just go ahead and dispatch the event.
+ // The timer is not active so the least frequent event for now is every byte. Just dispatch the event.
// We should not have any throttled progress event.
ASSERT(!m_hasThrottledProgressEvent);
Modified: trunk/Source/WebCore/xml/parser/XMLDocumentParser.cpp (182363 => 182364)
--- trunk/Source/WebCore/xml/parser/XMLDocumentParser.cpp 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebCore/xml/parser/XMLDocumentParser.cpp 2015-04-05 20:17:11 UTC (rev 182364)
@@ -121,7 +121,7 @@
doWrite(source.toString());
- // After parsing, go ahead and dispatch image beforeload events.
+ // After parsing, dispatch image beforeload events.
ImageLoader::dispatchPendingBeforeLoadEvents();
}
Modified: trunk/Source/WebKit/mac/ChangeLog (182363 => 182364)
--- trunk/Source/WebKit/mac/ChangeLog 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-04-05 20:17:11 UTC (rev 182364)
@@ -1,3 +1,18 @@
+2015-04-05 Simon Fraser <simon.fra...@apple.com>
+
+ Remove "go ahead and" from comments
+ https://bugs.webkit.org/show_bug.cgi?id=143421
+
+ Reviewed by Darin Adler, Benjamin Poulain.
+
+ Remove the phrase "go ahead and" from comments where it doesn't add
+ anything (which is almost all of them).
+
+ * WebView/WebDynamicScrollBarsView.mm:
+ (-[WebDynamicScrollBarsView updateScrollers]):
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView insertText:]):
+
2015-04-02 Brady Eidson <beid...@apple.com>
Unreviewed: Reland change after rollout.
Modified: trunk/Source/WebKit/mac/WebView/WebDynamicScrollBarsView.mm (182363 => 182364)
--- trunk/Source/WebKit/mac/WebView/WebDynamicScrollBarsView.mm 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebKit/mac/WebView/WebDynamicScrollBarsView.mm 2015-04-05 20:17:11 UTC (rev 182364)
@@ -285,8 +285,8 @@
{
NSView *documentView = [self documentView];
- // If we came in here with the view already needing a layout, then go ahead and do that
- // first. (This will be the common case, e.g., when the page changes due to window resizing for example).
+ // If we came in here with the view already needing a layout, then do that first.
+ // (This will be the common case, e.g., when the page changes due to window resizing for example).
// This layout will not re-enter updateScrollers and does not count towards our max layout pass total.
if (!_private->suppressLayout && !_private->suppressScrollers && [documentView isKindOfClass:[WebHTMLView class]]) {
WebHTMLView* htmlView = (WebHTMLView*)documentView;
Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (182363 => 182364)
--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-04-05 20:17:11 UTC (rev 182364)
@@ -6402,7 +6402,7 @@
// insertText can be called for several reasons:
// - If it's from normal key event processing (including key bindings), we may need to save the action to perform it later.
- // - If it's from an input method, then we should go ahead and insert the text now. We assume it's from the input method if we have marked text.
+ // - If it's from an input method, then we should insert the text now. We assume it's from the input method if we have marked text.
// FIXME: In theory, this could be wrong for some input methods, so we should try to find another way to determine if the call is from the input method.
// - If it's sent outside of keyboard event processing (e.g. from Character Viewer, or when confirming an inline input area with a mouse),
// then we also execute it immediately, as there will be no other chance.
Modified: trunk/Source/WebKit2/ChangeLog (182363 => 182364)
--- trunk/Source/WebKit2/ChangeLog 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-05 20:17:11 UTC (rev 182364)
@@ -1,3 +1,23 @@
+2015-04-05 Simon Fraser <simon.fra...@apple.com>
+
+ Remove "go ahead and" from comments
+ https://bugs.webkit.org/show_bug.cgi?id=143421
+
+ Reviewed by Darin Adler, Benjamin Poulain.
+
+ Remove the phrase "go ahead and" from comments where it doesn't add
+ anything (which is almost all of them).
+
+ * Platform/unix/EnvironmentUtilities.cpp:
+ (WebKit::EnvironmentUtilities::stripValuesEndingWithString):
+ * PluginProcess/PluginProcess.cpp:
+ (WebKit::PluginProcess::didClose):
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView insertText:replacementRange:]):
+ (-[WKView _pluginFocusOrWindowFocusChanged:pluginComplexTextInputIdentifier:]):
+ * UIProcess/Storage/LocalStorageDatabaseTracker.cpp:
+ (WebKit::LocalStorageDatabaseTracker::removeDatabaseWithOriginIdentifier):
+
2015-04-05 Antti Koivisto <an...@apple.com>
Bloom filter should support longer hashes
Modified: trunk/Source/WebKit2/Platform/unix/EnvironmentUtilities.cpp (182363 => 182364)
--- trunk/Source/WebKit2/Platform/unix/EnvironmentUtilities.cpp 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebKit2/Platform/unix/EnvironmentUtilities.cpp 2015-04-05 20:17:11 UTC (rev 182364)
@@ -71,7 +71,7 @@
// Copy over everything right of the match to the current component start, and search from there again.
if (componentStart[0] == ':') {
- // If componentStart points to a colon, go ahead and copy the colon over.
+ // If componentStart points to a colon, copy the colon over.
strcpy(componentStart, match + searchLength);
} else {
// Otherwise, componentStart still points to the beginning of environmentValueBuffer, so don't copy over the colon.
Modified: trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp (182363 => 182364)
--- trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp 2015-04-05 20:17:11 UTC (rev 182364)
@@ -124,7 +124,7 @@
void PluginProcess::didClose(IPC::Connection&)
{
- // The UI process has crashed, just go ahead and quit.
+ // The UI process has crashed, just quit.
// FIXME: If the plug-in is spinning in the main loop, we'll never get this message.
stopRunLoop();
}
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (182363 => 182364)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-04-05 20:17:11 UTC (rev 182364)
@@ -1608,7 +1608,7 @@
// insertText can be called for several reasons:
// - If it's from normal key event processing (including key bindings), we save the action to perform it later.
- // - If it's from an input method, then we should go ahead and insert the text now.
+ // - If it's from an input method, then we should insert the text now.
// - If it's sent outside of keyboard event processing (e.g. from Character Viewer, or when confirming an inline input area with a mouse),
// then we also execute it immediately, as there will be no other chance.
Vector<KeypressCommand>* keypressCommands = _data->_collectedKeypressCommands;
@@ -2078,7 +2078,7 @@
// insertText can be called for several reasons:
// - If it's from normal key event processing (including key bindings), we may need to save the action to perform it later.
- // - If it's from an input method, then we should go ahead and insert the text now. We assume it's from the input method if we have marked text.
+ // - If it's from an input method, then we should insert the text now. We assume it's from the input method if we have marked text.
// FIXME: In theory, this could be wrong for some input methods, so we should try to find another way to determine if the call is from the input method.
// - If it's sent outside of keyboard event processing (e.g. from Character Viewer, or when confirming an inline input area with a mouse),
// then we also execute it immediately, as there will be no other chance.
@@ -3394,7 +3394,7 @@
}
if (inputSourceChanged) {
- // The input source changed, go ahead and discard any entered text.
+ // The input source changed; discard any entered text.
[[WKTextInputWindowController sharedTextInputWindowController] unmarkText];
}
Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp (182363 => 182364)
--- trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp 2015-04-05 18:45:38 UTC (rev 182363)
+++ trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp 2015-04-05 20:17:11 UTC (rev 182364)
@@ -342,7 +342,7 @@
m_origins.remove(originIdentifier);
if (m_origins.isEmpty()) {
- // There are no origins left, go ahead and delete the tracker database.
+ // There are no origins left; delete the tracker database.
m_database.close();
deleteFile(trackerDatabasePath());
deleteEmptyDirectory(m_localStorageDirectory);
