Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-05 16:22:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 670508 Needs null check at starting table selection handling r=roc

Browse Source
This commit is contained in:
Masayuki Nakano 2011-07-14 12:55:27 +09:00
parent 29476224bf
commit db59b50bea
3 changed files with 50 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
layout/generic/nsFrame.cpp
View File

@ -2306,11 +2306,20 @@ nsFrame::HandlePress(nsPresContext* aPresContext,
// In table selection mode, a nearest scrollable frame should capture the
// mouse events.
if (captureMouse) {
// NOTE: we must have set a content to capture already. The content is
// selection root of this frame. Therefore, when there is no scrollable
// frame, we don't need to reset the capturing content.
NS_ASSERTION(nsIPresShell::GetCapturingContent() != nsnull,
"Someone must have captured mouse event already");
nsIScrollableFrame* scrollableFrame =
FindNearestScrollableFrameForSelection(this);
nsIFrame* frame = do_QueryFrame(scrollableFrame);
nsIPresShell::SetCapturingContent(frame->GetContent(),
CAPTURE_IGNOREALLOWED);
if (scrollableFrame) {
nsIFrame* frame = do_QueryFrame(scrollableFrame);
nsIContent* contentToCaptureForTableSelection =
GetContentToCaptureForSelection(frame->GetContent());
nsIPresShell::SetCapturingContent(contentToCaptureForTableSelection,
CAPTURE_IGNOREALLOWED);
}
}
fs->SetMouseDownState(PR_TRUE);
return fs->HandleTableSelection(parentContent, contentOffset, target, me);

1
layout/generic/test/Makefile.in
View File

@ -138,6 +138,7 @@ _CHROME_FILES = \
test_selection_scrolling.html \
window_selection_scrolling.html \
test_bug670058.html \
test_bug670508.html \
$(NULL)
libs:: $(_TEST_FILES)

37
layout/generic/test/test_bug670508.html Normal file
View File

@ -0,0 +1,37 @@
<!DOCTYPE>
<html>
<head>
<title>test for bug 670508</title>
<script type="text/javascript"
src="chrome://mochikit/content/MochiKit/packed.js"></script>
<script type="text/javascript"
src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript"
src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
<link rel="stylesheet" type="text/css"
href="chrome://mochikit/content/tests/SimpleTest/test.css" />
</head>
<body>
<table>
<tr>
<td id="td" contenteditable="true">
here is an editable table cell
</td>
</tr>
</table>
<pre id="test">
<script class="testbody" type="text/javascript">
SimpleTest.waitForExplicitFinish();
function doTest() {
synthesizeMouse(document.getElementById('td'), 5, 5, { ctrlKey: true });
ok(true, "not crashed");
SimpleTest.finish();
}
SimpleTest.waitForFocus(doTest, window);
</script>
</pre>
</body>
</html>