mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-12 00:50:40 +00:00
--NOT PART OF DEFAULT BUILD--
XMLterm changes only. Minor changes to get xmlterm to load with MathML/SVG enabled (but xmlterm still fails to flush reflows)
This commit is contained in:
parent
f5c45800dc
commit
df15bbe3ff
@ -2907,6 +2907,13 @@ NS_IMETHODIMP mozXMLTermSession::ScrollToBottomLeft(void)
|
||||
|
||||
XMLT_LOG(mozXMLTermSession::ScrollToBottomLeft,70,("\n"));
|
||||
|
||||
nsCOMPtr<nsIPresShell> presShell;
|
||||
result = mXMLTerminal->GetPresShell(getter_AddRefs(presShell));
|
||||
if (NS_FAILED(result) || !presShell)
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
presShell->FlushPendingNotifications();
|
||||
|
||||
// Get DOM Window
|
||||
nsCOMPtr<nsIDocShell> docShell;
|
||||
result = mXMLTerminal->GetDocShell(getter_AddRefs(docShell));
|
||||
@ -2920,13 +2927,6 @@ NS_IMETHODIMP mozXMLTermSession::ScrollToBottomLeft(void)
|
||||
if (NS_FAILED(result) || !domWindow)
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
nsCOMPtr<nsIPresShell> presShell;
|
||||
result = mXMLTerminal->GetPresShell(getter_AddRefs(presShell));
|
||||
if (NS_FAILED(result) || !presShell)
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
presShell->FlushPendingNotifications();
|
||||
|
||||
// Scroll to bottom left of screen
|
||||
domWindow->ScrollBy(-99999,99999);
|
||||
|
||||
|
@ -743,8 +743,8 @@ NS_IMETHODIMP mozXMLTerminal::ShowCaret(void)
|
||||
nsCOMPtr<nsISelectionController> selCon = do_QueryInterface(presShell);
|
||||
|
||||
if (!selCon) {
|
||||
return NS_ERROR_FAILURE;
|
||||
XMLT_WARNING("mozXMLTerminal::ShowCaret: Warning - Failed to get SelectionController\n");
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
PRInt32 pixelWidth;
|
||||
@ -762,7 +762,7 @@ NS_IMETHODIMP mozXMLTerminal::ShowCaret(void)
|
||||
selCon->SetCaretReadOnly(PR_FALSE);
|
||||
|
||||
nsCOMPtr<nsICaret> caret;
|
||||
if (NS_SUCCEEDED(presShell->GetCaret(getter_AddRefs(caret)))) {
|
||||
if (NS_SUCCEEDED(presShell->GetCaret(getter_AddRefs(caret))) && caret) {
|
||||
|
||||
caret->SetCaretVisible(PR_TRUE);
|
||||
caret->SetCaretReadOnly(PR_FALSE);
|
||||
@ -772,6 +772,8 @@ NS_IMETHODIMP mozXMLTerminal::ShowCaret(void)
|
||||
if (NS_SUCCEEDED(selCon->GetSelection(nsISelectionController::SELECTION_NORMAL, getter_AddRefs(sel))) && sel) {
|
||||
caret->SetCaretDOMSelection(sel);
|
||||
}
|
||||
} else {
|
||||
XMLT_WARNING("mozXMLTerminal::ShowCaret: Warning - Failed to get caret\n");
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
|
@ -140,7 +140,8 @@ foreach my $url (@ARGV) { # for each argument
|
||||
|
||||
} elsif ( ($scheme eq "http") ||
|
||||
(($scheme eq "file") && (($extension eq ".htm") ||
|
||||
($extension eq ".html")) ) ) {
|
||||
($extension eq ".html") ||
|
||||
($extension eq ".xml")) ) ) {
|
||||
## print STDERR "IFRAME\n";
|
||||
print "\e{S$cookie\n"; # HTML stream escape sequence
|
||||
print "<iframe frameborder=0 width='100%' height='$height' src='$scheme://${host}$pathname'></iframe>";
|
||||
|
Loading…
Reference in New Issue
Block a user