Changeset 182364 in webkit
- Timestamp:
- Apr 5, 2015 1:17:11 PM (9 years ago)
- Location:
- trunk/Source
- Files:
-
- 39 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r182347 r182364 1 2015-04-05 Simon Fraser <simon.fraser@apple.com> 2 3 Remove "go ahead and" from comments 4 https://bugs.webkit.org/show_bug.cgi?id=143421 5 6 Reviewed by Darin Adler, Benjamin Poulain. 7 8 Remove the phrase "go ahead and" from comments where it doesn't add 9 anything (which is almost all of them). 10 11 * interpreter/JSStack.cpp: 12 (JSC::JSStack::growSlowCase): 13 1 14 2015-04-04 Andreas Kling <akling@apple.com> 2 15 -
trunk/Source/JavaScriptCore/interpreter/JSStack.cpp
r177995 r182364 98 98 return false; 99 99 100 // Otherwise, the growth is still within our budget. Go ahead and commit 101 // it and return true. 100 // Otherwise, the growth is still within our budget. Commit it and return true. 102 101 m_reservation.commit(newCommitTop, delta); 103 102 addToCommittedByteCount(delta); -
trunk/Source/WebCore/ChangeLog
r182356 r182364 1 2015-04-05 Simon Fraser <simon.fraser@apple.com> 2 3 Remove "go ahead and" from comments 4 https://bugs.webkit.org/show_bug.cgi?id=143421 5 6 Reviewed by Darin Adler, Benjamin Poulain. 7 8 Remove the phrase "go ahead and" from comments where it doesn't add 9 anything (which is almost all of them). 10 11 * Modules/webdatabase/DatabaseTracker.cpp: 12 (WebCore::DatabaseTracker::deleteOriginLockFor): 13 * css/CSSFontFaceSrcValue.cpp: 14 (WebCore::CSSFontFaceSrcValue::isSupportedFormat): 15 * css/CSSPrimitiveValue.h: 16 * css/StyleResolver.cpp: 17 (WebCore::StyleResolver::styleForKeyframe): 18 (WebCore::StyleResolver::styleForPage): 19 (WebCore::StyleResolver::applyMatchedProperties): 20 * editing/ApplyStyleCommand.cpp: 21 (WebCore::ApplyStyleCommand::pushDownInlineStyleAroundNode): 22 * loader/DocumentLoader.cpp: 23 (WebCore::DocumentLoader::detachFromFrame): 24 * loader/cache/CachedImage.cpp: 25 (WebCore::CachedImage::addIncrementalDataBuffer): 26 * loader/icon/IconDatabase.cpp: 27 (WebCore::IconDatabase::performURLImport): 28 * page/PageOverlay.cpp: 29 (WebCore::PageOverlay::fadeAnimationTimerFired): 30 * platform/ScrollView.cpp: 31 (WebCore::ScrollView::updateScrollbars): 32 (WebCore::ScrollView::scrollContents): 33 * platform/graphics/DisplayRefreshMonitor.cpp: 34 (WebCore::DisplayRefreshMonitor::create): 35 * platform/graphics/GraphicsContext.cpp: 36 * platform/graphics/mac/ComplexTextController.cpp: 37 (WebCore::ComplexTextController::adjustGlyphsAndAdvances): 38 * platform/network/HTTPParsers.cpp: 39 (WebCore::parseHTTPRefresh): 40 * rendering/RenderBlock.cpp: 41 (WebCore::RenderBlock::removeChild): 42 (WebCore::RenderBlock::layoutPositionedObjects): 43 (WebCore::RenderBlock::selectionGaps): 44 (WebCore::RenderBlock::blockSelectionGaps): 45 (WebCore::RenderBlock::absoluteRects): 46 (WebCore::RenderBlock::absoluteQuads): 47 (WebCore::RenderBlock::addFocusRingRects): 48 * rendering/RenderBlockFlow.cpp: 49 (WebCore::RenderBlockFlow::layoutBlockChild): 50 (WebCore::RenderBlockFlow::handleAfterSideOfBlock): 51 (WebCore::RenderBlockFlow::adjustBlockChildForPagination): 52 (WebCore::RenderBlockFlow::insertFloatingObject): 53 (WebCore::RenderBlockFlow::addOverhangingFloats): 54 (WebCore::RenderBlockFlow::inlineSelectionGaps): 55 (WebCore::RenderBlockFlow::computeInlinePreferredLogicalWidths): 56 * rendering/RenderBlockLineLayout.cpp: 57 (WebCore::RenderBlockFlow::appendRunsForObject): 58 * rendering/RenderBox.cpp: 59 (WebCore::RenderBox::positionLineBox): 60 (WebCore::RenderBox::sizesLogicalWidthToFitContent): 61 * rendering/RenderBoxModelObject.cpp: 62 (WebCore::RenderBoxModelObject::paintFillLayerExtended): 63 * rendering/RenderLayer.cpp: 64 (WebCore::RenderLayer::updateLayerPositions): 65 (WebCore::RenderLayer::hitTestLayer): 66 (WebCore::RenderLayer::calculateClipRects): 67 * rendering/RenderLayerModelObject.cpp: 68 (WebCore::RenderLayerModelObject::styleWillChange): 69 * rendering/RenderLineBoxList.cpp: 70 (WebCore::RenderLineBoxList::dirtyLinesFromChangedChild): 71 * rendering/RenderTextLineBoxes.cpp: 72 (WebCore::RenderTextLineBoxes::dirtyRange): 73 * rendering/line/BreakingContext.h: 74 (WebCore::BreakingContext::handleOutOfFlowPositioned): 75 (WebCore::BreakingContext::handleText): 76 * rendering/line/LineBreaker.cpp: 77 (WebCore::LineBreaker::nextLineBreak): 78 * style/StyleResolveTree.cpp: 79 (WebCore::Style::resolveLocal): 80 * xml/XMLHttpRequestProgressEventThrottle.cpp: 81 (WebCore::XMLHttpRequestProgressEventThrottle::dispatchThrottledProgressEvent): 82 * xml/parser/XMLDocumentParser.cpp: 83 (WebCore::XMLDocumentParser::append): 84 1 85 2015-04-04 Andy Estes <aestes@apple.com> 2 86 -
trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp
r181837 r182364 685 685 // orderly clean up first when we remove its ref from the m_originLockMap. 686 686 // This may or may not be possible depending on whether other threads are 687 // also using the OriginLock at the same time. After that, we will go ahead 688 // and delete the lock file. 687 // also using the OriginLock at the same time. After that, we will delete the lock file. 689 688 690 689 m_originLockMap.remove(origin->databaseIdentifier()); -
trunk/Source/WebCore/css/CSSFontFaceSrcValue.cpp
r179242 r182364 54 54 { 55 55 // Normally we would just check the format, but in order to avoid conflicts with the old WinIE style of font-face, 56 // we will also check to see if the URL ends with .eot. If so, we'll go ahead andassume that we shouldn't load it.56 // we will also check to see if the URL ends with .eot. If so, we'll assume that we shouldn't load it. 57 57 if (m_format.isEmpty()) { 58 58 // Check for .eot. -
trunk/Source/WebCore/css/CSSPrimitiveValue.h
r182354 r182364 60 60 61 61 // Dimension calculations are imprecise, often resulting in values of e.g. 62 // 44.99998. We need to go ahead and round if we're really close to the next 63 // integer value. 62 // 44.99998. We need to round if we're really close to the next integer value. 64 63 template<typename T> inline T roundForImpreciseConversion(double value) 65 64 { -
trunk/Source/WebCore/css/StyleResolver.cpp
r182224 r182364 869 869 applyCascadedProperties(cascade, firstCSSProperty, lastHighPriorityProperty); 870 870 871 // If our font got dirtied, go ahead andupdate it now.871 // If our font got dirtied, update it now. 872 872 updateFont(); 873 873 … … 875 875 applyCascadedProperties(cascade, firstLowPriorityProperty, lastCSSProperty); 876 876 877 // If our font got dirtied by one of the non-essential font props, 878 // go ahead and update it a second time. 877 // If our font got dirtied by one of the non-essential font props, update it a second time. 879 878 updateFont(); 880 879 … … 1035 1034 applyCascadedProperties(cascade, firstCSSProperty, lastHighPriorityProperty); 1036 1035 1037 // If our font got dirtied, go ahead andupdate it now.1036 // If our font got dirtied, update it now. 1038 1037 updateFont(); 1039 1038 … … 1791 1790 return applyMatchedProperties(matchResult, element, DoNotUseMatchedPropertiesCache); 1792 1791 1793 // If our font got dirtied, go ahead andupdate it now.1792 // If our font got dirtied, update it now. 1794 1793 updateFont(); 1795 1794 -
trunk/Source/WebCore/editing/ApplyStyleCommand.cpp
r180809 r182364 1066 1066 1067 1067 // Apply style to all nodes containing targetNode and their siblings but NOT to targetNode 1068 // But if we've removed styledElement then go ahead andalways apply the style.1068 // But if we've removed styledElement then always apply the style. 1069 1069 if (&child != targetNode || styledElement) 1070 1070 applyInlineStyleToPushDown(&child, styleToPushDown.get()); -
trunk/Source/WebCore/loader/DocumentLoader.cpp
r182356 r182364 907 907 908 908 // It never makes sense to have a document loader that is detached from its 909 // frame have any loads active, so go ahead andkill all the loads.909 // frame have any loads active, so kill all the loads. 910 910 stopLoading(); 911 911 if (m_mainResource && m_mainResource->hasClient(this)) -
trunk/Source/WebCore/loader/cache/CachedImage.cpp
r181608 r182364 391 391 } 392 392 393 // Go ahead and tell our observers to try to draw. 394 // Each chunk from the network causes observers to repaint, which will 395 // force that chunk to decode. 393 // Tell our observers to try to draw. 394 // Each chunk from the network causes observers to repaint, which will force that chunk to decode. 396 395 // It would be nice to only redraw the decoded band of the image, but with the current design 397 396 // (decoding delayed until painting) that seems hard. -
trunk/Source/WebCore/loader/icon/IconDatabase.cpp
r179774 r182364 1222 1222 // If the pageRecord doesn't exist in this map, then no one has retained this pageURL 1223 1223 // If the s_databaseCleanupCounter count is non-zero, then we're not supposed to be pruning the database in any manner, 1224 // so go ahead andactually create a pageURLRecord for this url even though it's not retained.1224 // so actually create a pageURLRecord for this url even though it's not retained. 1225 1225 // If database cleanup *is* allowed, we don't want to bother pulling in a page url from disk that noone is actually interested 1226 1226 // in - we'll prune it later instead! -
trunk/Source/WebCore/page/PageOverlay.cpp
r176459 r182364 252 252 m_fadeAnimationType = NoAnimation; 253 253 254 // If this was a fade out, go ahead anduninstall the page overlay.254 // If this was a fade out, uninstall the page overlay. 255 255 if (wasFadingOut) 256 256 controller()->uninstallPageOverlay(this, PageOverlay::FadeMode::DoNotFade); -
trunk/Source/WebCore/platform/ScrollView.cpp
r182307 r182364 605 605 bool hasOverlayScrollbars = (!m_horizontalScrollbar || m_horizontalScrollbar->isOverlayScrollbar()) && (!m_verticalScrollbar || m_verticalScrollbar->isOverlayScrollbar()); 606 606 607 // If we came in here with the view already needing a layout , then go ahead and do that608 // first.(This will be the common case, e.g., when the page changes due to window resizing for example).607 // If we came in here with the view already needing a layout then do that first. 608 // (This will be the common case, e.g., when the page changes due to window resizing for example). 609 609 // This layout will not re-enter updateScrollbars and does not count towards our max layout pass total. 610 610 if (!m_scrollbarsSuppressed && !hasOverlayScrollbars) { … … 840 840 scrollContentsSlowPath(updateRect); 841 841 } else { 842 // We need to go ahead and repaint the entire backing store. Do it now before moving the 843 // windowed plugins. 844 scrollContentsSlowPath(updateRect); 842 // We need to repaint the entire backing store. Do it now before moving the windowed plugins. 843 scrollContentsSlowPath(updateRect); 845 844 } 846 845 -
trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp
r181656 r182364 43 43 return monitor.value(); 44 44 45 // If ChromeClient returned Nullopt, we'll go ahead andmake one of the default type.45 // If ChromeClient returned Nullopt, we'll make one of the default type. 46 46 47 47 #if PLATFORM(MAC) -
trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp
r180511 r182364 563 563 564 564 #if !USE(CG) 565 // Implement this if you want to go ahead and push the drawing mode into your native context 566 // immediately. 565 // Implement this if you want to go push the drawing mode into your native context immediately. 567 566 void GraphicsContext::setPlatformTextDrawingMode(TextDrawingModeFlags) 568 567 { -
trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp
r182236 r182364 690 690 691 691 if (hasExtraSpacing) { 692 // If we're a glyph with an advance, go ahead andadd in letter-spacing.692 // If we're a glyph with an advance, add in letter-spacing. 693 693 // That way we weed out zero width lurkers. This behavior matches the fast text code path. 694 694 if (advance.width) -
trunk/Source/WebCore/platform/network/HTTPParsers.cpp
r182271 r182364 224 224 // https://bugs.webkit.org/show_bug.cgi?id=27868 225 225 // Sometimes there is no closing quote for the end of the URL even though there was an opening quote. 226 // If we looped over the entire alleged URL string back to the opening quote, just go ahead anduse everything226 // If we looped over the entire alleged URL string back to the opening quote, just use everything 227 227 // after the opening quote instead. 228 228 if (urlEndPos == urlStartPos) -
trunk/Source/WebCore/rendering/RenderBlock.cpp
r182241 r182364 692 692 } 693 693 694 // If this child is a block, and if our previous and next siblings are 695 // both anonymous blocks with inline content, then we can go ahead and 696 // fold the inline content back together. 694 // If this child is a block, and if our previous and next siblings are both anonymous blocks 695 // with inline content, then we can fold the inline content back together. 697 696 RenderObject* prev = oldChild.previousSibling(); 698 697 RenderObject* next = oldChild.nextSibling(); … … 748 747 if (canMergeAnonymousBlocks && child && !child->previousSibling() && !child->nextSibling() && canCollapseAnonymousBlockChild()) { 749 748 // The removal has knocked us down to containing only a single anonymous 750 // box. We can go ahead and pull the content right back up into our 751 // box. 749 // box. We can pull the content right back up into our box. 752 750 collapseAnonymousBoxChild(*this, downcast<RenderBlock>(child)); 753 751 } else if (((prev && prev->isAnonymousBlock()) || (next && next->isAnonymousBlock())) && canCollapseAnonymousBlockChild()) { … … 1332 1330 r.clearNeedsLayout(); 1333 1331 1334 // If we are paginated or in a line grid, go ahead andcompute a vertical position for our object now.1332 // If we are paginated or in a line grid, compute a vertical position for our object now. 1335 1333 // If it's wrong we'll lay out again. 1336 1334 LayoutUnit oldLogicalTop = 0; … … 1861 1859 result = blockSelectionGaps(rootBlock, rootBlockPhysicalPosition, offsetFromRootBlock, lastLogicalTop, lastLogicalLeft, lastLogicalRight, cache, paintInfo); 1862 1860 1863 // Go ahead and fill the vertical gap all the way to the bottom of our block if the selection extends past our block.1861 // Fill the vertical gap all the way to the bottom of our block if the selection extends past our block. 1864 1862 if (&rootBlock == this && (selectionState() != SelectionBoth && selectionState() != SelectionEnd) && !isRubyBase() && !isRubyText()) { 1865 1863 result.uniteCenter(blockSelectionGap(rootBlock, rootBlockPhysicalPosition, offsetFromRootBlock, … … 1881 1879 GapRects result; 1882 1880 1883 // Go ahead and jump right to the first block child that contains some selected objects.1881 // Jump right to the first block child that contains some selected objects. 1884 1882 RenderBox* curr; 1885 1883 for (curr = firstChildBox(); curr && curr->selectionState() == SelectionNone; curr = curr->nextSiblingBox()) { } … … 1937 1935 lastLogicalRight = logicalRightSelectionOffset(rootBlock, curr->logicalBottom(), cache); 1938 1936 } else if (childState != SelectionNone && is<RenderBlock>(*curr)) { 1939 // We must be a block that has some selected object inside it . Go ahead andrecur.1937 // We must be a block that has some selected object inside it, so recur. 1940 1938 result.unite(downcast<RenderBlock>(*curr).selectionGaps(rootBlock, rootBlockPhysicalPosition, LayoutSize(offsetFromRootBlock.width() + curr->x(), offsetFromRootBlock.height() + curr->y()), 1941 1939 lastLogicalTop, lastLogicalLeft, lastLogicalRight, childCache, paintInfo)); … … 3313 3311 void RenderBlock::absoluteRects(Vector<IntRect>& rects, const LayoutPoint& accumulatedOffset) const 3314 3312 { 3315 // For blocks inside inlines, we go ahead and include margins so that we run right up to the 3316 // inline boxes above and below us (thus getting merged with them to form a single irregular 3317 // shape). 3313 // For blocks inside inlines, we include margins so that we run right up to the inline boxes 3314 // above and below us (thus getting merged with them to form a single irregular shape). 3318 3315 if (isAnonymousBlockContinuation()) { 3319 3316 // FIXME: This is wrong for block-flows that are horizontal. … … 3329 3326 void RenderBlock::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed) const 3330 3327 { 3331 // For blocks inside inlines, we go ahead and include margins so that we run right up to the 3332 // inline boxes above and below us (thus getting merged with them to form a single irregular 3333 // shape). 3328 // For blocks inside inlines, we include margins so that we run right up to the inline boxes 3329 // above and below us (thus getting merged with them to form a single irregular shape). 3334 3330 FloatRect localRect = isAnonymousBlockContinuation() 3335 3331 ? FloatRect(0, -collapsedMarginBefore(), width(), height() + collapsedMarginBefore() + collapsedMarginAfter()) … … 3414 3410 void RenderBlock::addFocusRingRects(Vector<IntRect>& rects, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer) 3415 3411 { 3416 // For blocks inside inlines, we go ahead and include margins so that we run right up to the 3417 // inline boxes above and below us (thus getting merged with them to form a single irregular 3418 // shape). 3412 // For blocks inside inlines, we include margins so that we run right up to the inline boxes 3413 // above and below us (thus getting merged with them to form a single irregular shape). 3419 3414 if (inlineElementContinuation()) { 3420 3415 // FIXME: This check really isn't accurate. -
trunk/Source/WebCore/rendering/RenderBlockFlow.cpp
r182241 r182364 672 672 LayoutSize oldLayoutDelta = view().layoutDelta(); 673 673 #endif 674 // Go ahead and position the child as though it didn't collapse with the top.674 // Position the child as though it didn't collapse with the top. 675 675 setLogicalTopForChild(child, logicalTopEstimate, ApplyLayoutDelta); 676 676 estimateRegionRangeForBoxChild(child); … … 729 729 if (logicalTopAfterClear != logicalTopEstimate || child.needsLayout() || (paginated && childBlockFlow && childBlockFlow->shouldBreakAtLineToAvoidWidow())) { 730 730 if (child.shrinkToAvoidFloats()) { 731 // The child's width depends on the line width. 732 // When the child shifts to clear an item, its width can 733 // change (because it has more available line width). 734 // So go ahead and mark the item as dirty. 731 // The child's width depends on the line width. When the child shifts to clear an item, its width can 732 // change (because it has more available line width). So mark the item as dirty. 735 733 child.setChildNeedsLayout(MarkOnlyThis); 736 734 } … … 1313 1311 setLogicalHeight(logicalHeight() - downcast<RenderBlockFlow>(*lastBlock).marginOffsetForSelfCollapsingBlock()); 1314 1312 1315 // If we can't collapse with children then go ahead andadd in the bottom margin.1313 // If we can't collapse with children then add in the bottom margin. 1316 1314 if (!marginInfo.discardMargin() && (!marginInfo.canCollapseWithMarginAfter() && !marginInfo.canCollapseWithMarginBefore() 1317 1315 && (!document().inQuirksMode() || !marginInfo.quirkContainer() || !marginInfo.hasMarginAfterQuirk()))) … … 1527 1525 1528 1526 if (child.shrinkToAvoidFloats()) { 1529 // The child's width depends on the line width. 1530 // When the child shifts to clear an item, its width can 1531 // change (because it has more available line width). 1532 // So go ahead and mark the item as dirty. 1527 // The child's width depends on the line width. When the child shifts to clear an item, its width can 1528 // change (because it has more available line width). So mark the item as dirty. 1533 1529 child.setChildNeedsLayout(MarkOnlyThis); 1534 1530 } … … 1589 1585 } 1590 1586 1591 // Similar to how we apply clearance. Go ahead and boost height() to be the place where we're going to position the child.1587 // Similar to how we apply clearance. Boost height() to be the place where we're going to position the child. 1592 1588 setLogicalHeight(logicalHeight() + (result - oldTop)); 1593 1589 … … 2232 2228 std::unique_ptr<FloatingObject> floatingObject = FloatingObject::create(floatBox); 2233 2229 2234 // Our location is irrelevant if we're unsplittable or no pagination is in effect. 2235 // Just go ahead and lay out the float. 2230 // Our location is irrelevant if we're unsplittable or no pagination is in effect. Just lay out the float. 2236 2231 bool isChildRenderBlock = floatBox.isRenderBlock(); 2237 2232 if (isChildRenderBlock && !floatBox.needsLayout() && view().layoutState()->pageLogicalHeightChanged()) … … 2663 2658 } 2664 2659 2665 // 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 2666 // child now. 2660 // 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. 2667 2661 if (floatingObject->isDescendant()) 2668 2662 child.addOverflowFromChild(&floatingObject->renderer(), LayoutSize(xPositionForFloatIncludingMargin(floatingObject), yPositionForFloatIncludingMargin(floatingObject))); … … 3058 3052 if (!hasLines()) { 3059 3053 if (containsStart) { 3060 // Go ahead and update our lastLogicalTop to be the bottom of the block. <hr>s or empty blocks with height can trip this 3061 // case. 3054 // Update our lastLogicalTop to be the bottom of the block. <hr>s or empty blocks with height can trip this case. 3062 3055 lastLogicalTop = blockDirectionOffset(rootBlock, offsetFromRootBlock) + logicalHeight(); 3063 3056 lastLogicalLeft = logicalLeftSelectionOffset(rootBlock, logicalHeight(), cache); … … 3095 3088 3096 3089 if (lastSelectedLine && selectionState() != SelectionEnd && selectionState() != SelectionBoth) { 3097 // Go ahead and update our lastY to be the bottom of the last selected line.3090 // Update our lastY to be the bottom of the last selected line. 3098 3091 lastLogicalTop = blockDirectionOffset(rootBlock, offsetFromRootBlock) + lastSelectedLine->selectionBottom(); 3099 3092 lastLogicalLeft = logicalLeftSelectionOffset(rootBlock, lastSelectedLine->selectionBottom(), cache); … … 4031 4024 4032 4025 if (!child->isBR()) { 4033 // Step One: determine whether or not we need to go ahead and 4034 // terminate our current line. Each discrete chunk can become 4035 // the new min-width, if it is the widest chunk seen so far, and 4036 // it can also become the max-width. 4026 // Step One: determine whether or not we need to terminate our current line. 4027 // Each discrete chunk can become the new min-width, if it is the widest chunk 4028 // seen so far, and it can also become the max-width. 4037 4029 4038 4030 // Children fall into three categories: … … 4043 4035 // (2) An inline non-text non-flow object, e.g., an inline replaced element. 4044 4036 // These objects can always be on a line by themselves, so in this situation 4045 // we need to go ahead and break the current line, and then add in our own4046 // margins and min/maxwidth on its own line, and then terminate the line.4037 // we need to break the current line, and then add in our own margins and min/max 4038 // width on its own line, and then terminate the line. 4047 4039 // 4048 4040 // (3) A text object. Text runs can have breakable characters at the start, … … 4056 4048 // (c) the min/max width of the string (trimmed for whitespace). 4057 4049 // 4058 // If the text string starts with whitespace, then we need to go ahead and 4059 // terminate our current line (unless we're already in a whitespace stripping 4060 // mode. 4050 // If the text string starts with whitespace, then we need to terminate our current line 4051 // (unless we're already in a whitespace stripping mode. 4061 4052 // 4062 4053 // If the text string has a breakable character in the middle, but didn't start … … 4104 4095 if (!is<RenderInline>(*child) && !is<RenderText>(*child)) { 4105 4096 // Case (2). Inline replaced elements and floats. 4106 // Go ahead and terminate the current line as far as 4107 // minwidth is concerned. 4097 // Terminate the current line as far as minwidth is concerned. 4108 4098 childMin += child->minPreferredLogicalWidth().ceilToFloat(); 4109 4099 childMax += child->maxPreferredLogicalWidth().ceilToFloat(); … … 4241 4231 // we start and end with whitespace. 4242 4232 if (beginWS) { 4243 // Go ahead and end the current line.4233 // End the current line. 4244 4234 minLogicalWidth = preferredWidth(minLogicalWidth, inlineMin); 4245 4235 } else { … … 4252 4242 4253 4243 if (endWS) { 4254 // We end in whitespace, which means we can go ahead 4255 // and end our current line. 4244 // We end in whitespace, which means we can end our current line. 4256 4245 minLogicalWidth = preferredWidth(minLogicalWidth, inlineMin); 4257 4246 inlineMin = 0; -
trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp
r182286 r182364 104 104 } 105 105 106 // An end midpoint has been encountered within our object. We 107 // need to go ahead and append a run with our endpoint. 106 // An end midpoint has been encountered within our object. We need to append a run with our endpoint. 108 107 if (static_cast<int>(nextMidpoint.offset() + 1) <= end) { 109 108 lineMidpointState.setBetweenMidpoints(true); -
trunk/Source/WebCore/rendering/RenderBox.cpp
r182241 r182364 2083 2083 rootBox.blockFlow().setStaticInlinePositionForChild(*this, rootBox.lineTopWithLeading(), LayoutUnit::fromFloatRound(box.logicalLeft())); 2084 2084 if (style().hasStaticInlinePosition(box.isHorizontal())) 2085 setChildNeedsLayout(MarkOnlyThis); // Just go ahead andmark the positioned object as needing layout, so it will update its position properly.2085 setChildNeedsLayout(MarkOnlyThis); // Just mark the positioned object as needing layout, so it will update its position properly. 2086 2086 } else { 2087 2087 // Our object was a block originally, so we make our normal flow position be … … 2091 2091 layer()->setStaticBlockPosition(box.logicalTop()); 2092 2092 if (style().hasStaticBlockPosition(box.isHorizontal())) 2093 setChildNeedsLayout(MarkOnlyThis); // Just go ahead andmark the positioned object as needing layout, so it will update its position properly.2093 setChildNeedsLayout(MarkOnlyThis); // Just mark the positioned object as needing layout, so it will update its position properly. 2094 2094 } 2095 2095 … … 2489 2489 2490 2490 // Flexible box items should shrink wrap, so we lay them out at their intrinsic widths. 2491 // In the case of columns that have a stretch alignment, we go ahead and layout at the2492 // stretched sizeto avoid an extra layout when applying alignment.2491 // In the case of columns that have a stretch alignment, we layout at the stretched size 2492 // to avoid an extra layout when applying alignment. 2493 2493 if (parent()->isFlexibleBox()) { 2494 2494 // For multiline columns, we need to apply align-content first, so we can't stretch now. -
trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp
r182197 r182364 814 814 backgroundRect.intersect(paintInfo.rect); 815 815 816 // If we have an alpha and we are painting the root element, go ahead andblend with the base background color.816 // If we have an alpha and we are painting the root element, blend with the base background color. 817 817 Color baseColor; 818 818 bool shouldClearBackground = false; -
trunk/Source/WebCore/rendering/RenderLayer.cpp
r182345 r182364 537 537 m_has3DTransformedAncestor = flags & Seen3DTransformedLayer; 538 538 539 // Go ahead and update the reflection's position and size.539 // Update the reflection's position and size. 540 540 if (m_reflection) 541 541 m_reflection->layout(); … … 5007 5007 ClipRectsContext clipRectsContext(rootLayer, RootRelativeClipRects, IncludeOverlayScrollbarSize); 5008 5008 ClipRect clipRect = backgroundClipRect(clipRectsContext); 5009 // Go ahead and test the enclosing clip now.5009 // Test the enclosing clip now. 5010 5010 if (!clipRect.intersects(hitTestLocation)) 5011 5011 return nullptr; … … 5604 5604 5605 5605 if (renderer().hasClip()) { 5606 // Clip applies to *us* as well, so go ahead andupdate the damageRect.5606 // Clip applies to *us* as well, so update the damageRect. 5607 5607 LayoutRect newPosClip = downcast<RenderBox>(renderer()).clipRect(toLayoutPoint(offsetFromRootLocal), namedFlowFragment); 5608 5608 backgroundRect.intersect(newPosClip); … … 5611 5611 } 5612 5612 5613 // If we establish a clip at all, then go ahead and make sure our background 5614 // rect is intersected with our layer's bounds including our visual overflow, 5613 // If we establish a clip at all, then make sure our background rect is intersected with our layer's bounds including our visual overflow, 5615 5614 // since any visual overflow like box-shadow or border-outset is not clipped by overflow:auto/hidden. 5616 5615 if (renderBox()->hasVisualOverflow()) { … … 5740 5739 return false; 5741 5740 5742 // If we aren't an inline flow, and our layer bounds do intersect the damage rect, then we 5743 // can go ahead and return true. 5741 // If we aren't an inline flow, and our layer bounds do intersect the damage rect, then we can return true. 5744 5742 if (!renderer().isRenderInline()) { 5745 5743 LayoutRect b = layerBounds; -
trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp
r177259 r182364 102 102 103 103 if (diff == StyleDifferenceLayout || diff == StyleDifferenceSimplifiedLayout) { 104 // When a layout hint happens, we go ahead and do a repaint of the layer, since the layer could 105 // end up being destroyed. 104 // When a layout hint happens, we do a repaint of the layer, since the layer could end up being destroyed. 106 105 if (hasLayer()) { 107 106 if (oldStyle->position() != newStyle.position() -
trunk/Source/WebCore/rendering/RenderLineBoxList.cpp
r182279 r182364 316 316 // If we have no first line box, then just bail early. 317 317 if (!firstBox) { 318 // For an empty inline, go ahead and propagate the check up to our parent, unless the parent 319 // is already dirty. 318 // For an empty inline, propagate the check up to our parent, unless the parent is already dirty. 320 319 if (container.isInline() && !container.ancestorLineBoxDirty()) { 321 320 container.parent()->dirtyLinesFromChangedChild(container); -
trunk/Source/WebCore/rendering/RenderTextLineBoxes.cpp
r181505 r182364 634 634 firstRootBox = &rootBox; 635 635 if (!dirtiedLines) { 636 // The affected area was in between two runs. Go ahead and mark the root box of 637 // the run after the affected area as dirty. 636 // The affected area was in between two runs. Mark the root box of the run after the affected area as dirty. 638 637 firstRootBox->markDirty(); 639 638 dirtiedLines = true; -
trunk/Source/WebCore/rendering/line/BreakingContext.h
r182241 r182364 384 384 inline void BreakingContext::handleOutOfFlowPositioned(Vector<RenderBox*>& positionedObjects) 385 385 { 386 // If our original display wasn't an inline type, then we can 387 // go ahead and determine our static inline position now. 386 // If our original display wasn't an inline type, then we can determine our static inline position now. 388 387 auto& box = downcast<RenderBox>(*m_current.renderer()); 389 388 bool isInlineType = box.style().isOriginalDisplayInlineType(); … … 391 390 m_block.setStaticInlinePositionForChild(box, m_block.logicalHeight(), m_block.startOffsetForContent(m_block.logicalHeight())); 392 391 else { 393 // If our original display was an INLINE type, then we can go ahead 394 // and determine our static y position now. 392 // If our original display was an INLINE type, then we can determine our static y position now. 395 393 box.layer()->setStaticBlockPosition(m_block.logicalHeight()); 396 394 } … … 921 919 922 920 if (!m_ignoringSpaces && m_currentStyle->collapseWhiteSpace()) { 923 // If we encounter a newline, or if we encounter a 924 // second space, we need to go ahead and break up this 925 // run and enter a mode where we start collapsing spaces. 921 // If we encounter a newline, or if we encounter a second space, 922 // we need to break up this run and enter a mode where we start collapsing spaces. 926 923 if (m_currentCharacterIsSpace && previousCharacterIsSpace) { 927 924 m_ignoringSpaces = true; -
trunk/Source/WebCore/rendering/line/LineBreaker.cpp
r181171 r182364 109 109 } else if (context.currentObject()->isText()) { 110 110 if (context.handleText(wordMeasurements, m_hyphenated, consecutiveHyphenatedLines)) { 111 // We've hit a hard text line break. Our line break iterator is updated, so go ahead andearly return.111 // We've hit a hard text line break. Our line break iterator is updated, so early return. 112 112 return context.lineBreak(); 113 113 } -
trunk/Source/WebCore/style/StyleResolveTree.cpp
r182147 r182364 772 772 } 773 773 774 // If "rem" units are used anywhere in the document, and if the document element's font size changes, then go ahead andforce font updating774 // If "rem" units are used anywhere in the document, and if the document element's font size changes, then force font updating 775 775 // 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). 776 776 if (document.styleSheetCollection().usesRemUnits() && document.documentElement() == ¤t && localChange != NoChange && currentStyle && newStyle && currentStyle->fontSize() != newStyle->fontSize()) { -
trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp
r177733 r182364 67 67 68 68 if (!isActive()) { 69 // The timer is not active so the least frequent event for now is every byte. 70 // Just go ahead and dispatch the event. 69 // The timer is not active so the least frequent event for now is every byte. Just dispatch the event. 71 70 72 71 // We should not have any throttled progress event. -
trunk/Source/WebCore/xml/parser/XMLDocumentParser.cpp
r182266 r182364 122 122 doWrite(source.toString()); 123 123 124 // After parsing, go ahead anddispatch image beforeload events.124 // After parsing, dispatch image beforeload events. 125 125 ImageLoader::dispatchPendingBeforeLoadEvents(); 126 126 } -
trunk/Source/WebKit/mac/ChangeLog
r182303 r182364 1 2015-04-05 Simon Fraser <simon.fraser@apple.com> 2 3 Remove "go ahead and" from comments 4 https://bugs.webkit.org/show_bug.cgi?id=143421 5 6 Reviewed by Darin Adler, Benjamin Poulain. 7 8 Remove the phrase "go ahead and" from comments where it doesn't add 9 anything (which is almost all of them). 10 11 * WebView/WebDynamicScrollBarsView.mm: 12 (-[WebDynamicScrollBarsView updateScrollers]): 13 * WebView/WebHTMLView.mm: 14 (-[WebHTMLView insertText:]): 15 1 16 2015-04-02 Brady Eidson <beidson@apple.com> 2 17 -
trunk/Source/WebKit/mac/WebView/WebDynamicScrollBarsView.mm
r155217 r182364 286 286 NSView *documentView = [self documentView]; 287 287 288 // If we came in here with the view already needing a layout, then go ahead and do that289 // first.(This will be the common case, e.g., when the page changes due to window resizing for example).288 // If we came in here with the view already needing a layout, then do that first. 289 // (This will be the common case, e.g., when the page changes due to window resizing for example). 290 290 // This layout will not re-enter updateScrollers and does not count towards our max layout pass total. 291 291 if (!_private->suppressLayout && !_private->suppressScrollers && [documentView isKindOfClass:[WebHTMLView class]]) { -
trunk/Source/WebKit/mac/WebView/WebHTMLView.mm
r182026 r182364 6403 6403 // insertText can be called for several reasons: 6404 6404 // - If it's from normal key event processing (including key bindings), we may need to save the action to perform it later. 6405 // - If it's from an input method, then we should go ahead andinsert the text now. We assume it's from the input method if we have marked text.6405 // - 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. 6406 6406 // 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. 6407 6407 // - If it's sent outside of keyboard event processing (e.g. from Character Viewer, or when confirming an inline input area with a mouse), -
trunk/Source/WebKit2/ChangeLog
r182363 r182364 1 2015-04-05 Simon Fraser <simon.fraser@apple.com> 2 3 Remove "go ahead and" from comments 4 https://bugs.webkit.org/show_bug.cgi?id=143421 5 6 Reviewed by Darin Adler, Benjamin Poulain. 7 8 Remove the phrase "go ahead and" from comments where it doesn't add 9 anything (which is almost all of them). 10 11 * Platform/unix/EnvironmentUtilities.cpp: 12 (WebKit::EnvironmentUtilities::stripValuesEndingWithString): 13 * PluginProcess/PluginProcess.cpp: 14 (WebKit::PluginProcess::didClose): 15 * UIProcess/API/mac/WKView.mm: 16 (-[WKView insertText:replacementRange:]): 17 (-[WKView _pluginFocusOrWindowFocusChanged:pluginComplexTextInputIdentifier:]): 18 * UIProcess/Storage/LocalStorageDatabaseTracker.cpp: 19 (WebKit::LocalStorageDatabaseTracker::removeDatabaseWithOriginIdentifier): 20 1 21 2015-04-05 Antti Koivisto <antti@apple.com> 2 22 -
trunk/Source/WebKit2/Platform/unix/EnvironmentUtilities.cpp
r103880 r182364 72 72 // Copy over everything right of the match to the current component start, and search from there again. 73 73 if (componentStart[0] == ':') { 74 // If componentStart points to a colon, go ahead andcopy the colon over.74 // If componentStart points to a colon, copy the colon over. 75 75 strcpy(componentStart, match + searchLength); 76 76 } else { -
trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp
r180225 r182364 125 125 void PluginProcess::didClose(IPC::Connection&) 126 126 { 127 // The UI process has crashed, just go ahead andquit.127 // The UI process has crashed, just quit. 128 128 // FIXME: If the plug-in is spinning in the main loop, we'll never get this message. 129 129 stopRunLoop(); -
trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm
r182341 r182364 1609 1609 // insertText can be called for several reasons: 1610 1610 // - If it's from normal key event processing (including key bindings), we save the action to perform it later. 1611 // - If it's from an input method, then we should go ahead andinsert the text now.1611 // - If it's from an input method, then we should insert the text now. 1612 1612 // - If it's sent outside of keyboard event processing (e.g. from Character Viewer, or when confirming an inline input area with a mouse), 1613 1613 // then we also execute it immediately, as there will be no other chance. … … 2079 2079 // insertText can be called for several reasons: 2080 2080 // - If it's from normal key event processing (including key bindings), we may need to save the action to perform it later. 2081 // - If it's from an input method, then we should go ahead andinsert the text now. We assume it's from the input method if we have marked text.2081 // - 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. 2082 2082 // 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. 2083 2083 // - If it's sent outside of keyboard event processing (e.g. from Character Viewer, or when confirming an inline input area with a mouse), … … 3395 3395 3396 3396 if (inputSourceChanged) { 3397 // The input source changed , go ahead anddiscard any entered text.3397 // The input source changed; discard any entered text. 3398 3398 [[WKTextInputWindowController sharedTextInputWindowController] unmarkText]; 3399 3399 } -
trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp
r180410 r182364 343 343 m_origins.remove(originIdentifier); 344 344 if (m_origins.isEmpty()) { 345 // There are no origins left , go ahead anddelete the tracker database.345 // There are no origins left; delete the tracker database. 346 346 m_database.close(); 347 347 deleteFile(trackerDatabasePath());
Note: See TracChangeset
for help on using the changeset viewer.