Bug 1604394 - Remove dead assignment from nsIFrame::PeekOffset. r=dbaron
authorAlex Henrie <alexhenrie24@gmail.com>
Tue, 17 Dec 2019 05:09:00 +0000
changeset 507353 83fc8cf83221d0b488ea2f01fb1aebcd688e3fa3
parent 507352 54c2441b54abdbcc73e8c206da154c9b902550cd
child 507354 4f4af8eef9d88978fdc695f19715fb6dbe6f4c21
push id103383
push userdbaron@mozilla.com
push dateTue, 17 Dec 2019 05:10:19 +0000
treeherderautoland@83fc8cf83221 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdbaron
bugs1604394
milestone73.0a1
first release with
nightly linux32
83fc8cf83221 / 73.0a1 / 20191217104440 / files
nightly linux64
83fc8cf83221 / 73.0a1 / 20191217104440 / files
nightly mac
83fc8cf83221 / 73.0a1 / 20191217104440 / files
nightly win32
83fc8cf83221 / 73.0a1 / 20191217104440 / files
nightly win64
83fc8cf83221 / 73.0a1 / 20191217104440 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1604394 - Remove dead assignment from nsIFrame::PeekOffset. r=dbaron Differential Revision: https://phabricator.services.mozilla.com/D57418
layout/generic/nsFrame.cpp
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -8693,17 +8693,16 @@ nsresult nsIFrame::PeekOffset(nsPeekOffs
       nsIFrame* blockFrame = this;
 
       while (NS_FAILED(result)) {
         int32_t thisLine = nsFrame::GetLineNumber(
             blockFrame, aPos->mScrollViewStop, &blockFrame);
         if (thisLine < 0) return NS_ERROR_FAILURE;
         iter = blockFrame->GetLineIterator();
         NS_ASSERTION(iter, "GetLineNumber() succeeded but no block frame?");
-        result = NS_OK;
 
         int edgeCase = 0;  // no edge case. this should look at thisLine
 
         bool doneLooping = false;  // tells us when no more block frames hit.
         // this part will find a frame or a block frame. if it's a block frame
         // it will "drill down" to find a viable frame or it will return an
         // error.
         nsIFrame* lastFrame = this;