mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 469774 - Never descend into nsMenuPopupFrames when building display lists. Fixes drawing bugs that occurred when a caret was visible in a popup. r=roc 

--HG--
extra : rebase_source : 9979c98dd1e7dac3994f2b3b5401306656d0a3b7
This commit is contained in:
Markus Stange 2009-09-08 09:43:20 +12:00
Родитель 7b1932885e
Коммит b8b16b6e54
3 изменённых файлов: 77 добавлений и 1 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
layout/generic/nsFrame.cpp
Просмотреть файл

@ -1417,7 +1417,7 @@ nsIFrame::BuildDisplayListForChild(nsDisplayListBuilder* aBuilder,
nsPlaceholderFrame* placeholder = static_cast<nsPlaceholderFrame*>(aChild);
aChild = placeholder->GetOutOfFlowFrame();
NS_ASSERTION(aChild, "No out of flow frame?");
if (!aChild)
if (!aChild || aChild->GetType() == nsGkAtoms::menuPopupFrame)
return NS_OK;
// update for the new child
disp = aChild->GetStyleDisplay();

1
layout/generic/test/Makefile.in
Просмотреть файл

@ -84,6 +84,7 @@ _TEST_FILES = \
test_bug460532.html \
test_bug468167.html \
test_bug469613.xul \
test_bug469774.xul \
test_bug470212.html \
test_bug503813.html \
test_bug507902.html \

75
layout/generic/test/test_bug469774.xul Normal file
Просмотреть файл

@ -0,0 +1,75 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=469774
-->
<window title="Mozilla Bug 469774"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<title>Test for Bug 469774</title>
<script type="application/javascript" src="/MochiKit/packed.js" />
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"/>
<script type="text/javascript" src="/tests/SimpleTest/WindowSnapshot.js"></script>
<vbox height="50"/>
<menupopup id="popup">
<textbox id="textbox"/>
</menupopup>
<body xmlns="http://www.w3.org/1999/xhtml">
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=469774">Mozilla Bug 469774</a>
<p id="display"></p>
<div id="content" style="display: none">
</div>
</body>
<script class="testbody" type="application/javascript;version=1.7"><![CDATA[
/** Test for Bug 469774 **/
// Test whether menu popups are blocked from being painted in their parent window.
// Like snapshotWindow, but with DRAWWINDOW_DRAW_CARET
function snapShot() {
netscape.security.PrivilegeManager.enablePrivilege('UniversalBrowserRead');
var canvas = document.createElementNS("http://www.w3.org/1999/xhtml", "canvas");
canvas.setAttribute("width", 200);
canvas.setAttribute("height", 50);
var ctx = canvas.getContext("2d");
ctx.drawWindow(window, 0, 0, 200, 50, "transparent", ctx.DRAWWINDOW_DRAW_CARET);
return canvas;
}
function doTest() {
window.removeEventListener("focus", doTest, false);
var before = snapShot();
var popup = document.getElementById("popup");
popup.openPopup(null, "after_start", 0, 0, false, false);
popup.addEventListener("popupshown", function() {
var textbox = document.getElementById("textbox");
textbox.focus(); // show caret
var after = snapShot();
var equal, str1, str2;
[equal, str1, str2] = compareSnapshots(after, before, true);
ok(equal, "Showing a popup shouldn't affect drawing in its parent window",
"got " + str1 + " but expected " + str2);
popup.hidePopup();
SimpleTest.finish();
}, false);
}
SimpleTest.waitForExplicitFinish();
window.addEventListener("focus", doTest, false);
]]></script>
</window>