corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 773432 - Don't overlay an image if it's not in the primary selection. r=roc

Browse Source
This commit is contained in:
Mats Palmgren
2012-07-16 12:15:06 -04:00
parent ba1ad0f277
commit 9f76cd2720
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
layout/generic/nsFrame.cpp
View File

@@ -1331,17 +1331,24 @@ nsFrame::DisplaySelectionOverlay(nsDisplayListBuilder* aBuilder,
SelectionDetails *details;
//look up to see what selection(s) are on this frame
details = frameSelection->LookUpSelection(newContent, offset, 1, false);
// XXX is the above really necessary? We don't actually DO anything
// with the details other than test that they're non-null
if (!details)
return NS_OK;
bool normal = false;
while (details) {
if (details->mType == nsISelectionController::SELECTION_NORMAL) {
normal = true;
}
SelectionDetails *next = details->mNext;
delete details;
details = next;
}
if (!normal && aContentType == nsISelectionDisplay::DISPLAY_IMAGES) {
// Don't overlay an image if it's not in the primary selection.
return NS_OK;
}
return aList->AppendNewToTop(new (aBuilder)
nsDisplaySelectionOverlay(aBuilder, this, selectionValue));
}