Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 22:05:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge mozilla-inbound and mozilla-central

Browse Source
This commit is contained in:
Ehsan Akhgari 2011-07-13 17:27:28 -04:00
commit 175117edf4
5 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
layout/forms/crashtests/669767.html Normal file
View File

@ -0,0 +1,14 @@
<html>
<head>
<title>Untitled</title>
</head>
<body>
<iframe src="data:text/html;charset=utf-8,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody%3E%0A%3Ctextarea%3E%3C/textarea%3E%0A%0A%0A%3Cstyle%3E%0A@font-face%20%7B%0A%20%20%20%20%20%20font-family%3A%20%22cutabovetherest%22%3B%0A%20%20%20%20%20%20src%3A%20url%28%22http%3A//www.webpagepublicity.com/free-fonts/a/A%2520Cut%2520Above%2520The%2520Rest.ttf%22%29%3B%0A%7D%20%20%20%20%0A%0A%3C/style%3E%0A%0A%3Coptgroup%20contenteditable%3D%22true%22%20style%3D%22display%3A%20inline%3B%22%3E%3C/optgroup%3E%0A%0A%3C/body%3E%3C/html%3E"></iframe>
<script>
</script>
</body>
</html>

1
layout/forms/crashtests/crashtests.list
View File

@ -46,3 +46,4 @@ asserts(1) load 578604-1.html # bug 584564
asserts(3-5) load 590302-1.xhtml # bug 584564
load 626014.xhtml
load 639733.xhtml
load 669767.html

6
layout/forms/nsTextControlFrame.h
View File

@ -295,12 +295,18 @@ protected:
NS_IMETHOD Run() {
if (mFrame) {
// need to block script to avoid bug 669767
nsAutoScriptBlocker scriptBlocker;
nsCOMPtr<nsIPresShell> shell =
mFrame->PresContext()->GetPresShell();
PRBool observes = shell->ObservesNativeAnonMutationsForPrint();
shell->ObserveNativeAnonMutationsForPrint(PR_TRUE);
// This can cause the frame to be destroyed (and call Revoke()
mFrame->EnsureEditorInitialized();
shell->ObserveNativeAnonMutationsForPrint(observes);
NS_ASSERTION(mFrame,"Frame destroyed even though we had a scriptblocker");
mFrame->FinishedInitializer();
}
return NS_OK;

2
testing/jetpack/jetpack-location.txt
View File

@ -1 +1 @@
http://hg.mozilla.org/projects/addon-sdk/archive/19b2d58d7fa6.tar.bz2
http://hg.mozilla.org/projects/addon-sdk/archive/49e4c09bca42.tar.bz2

7
toolkit/components/telemetry/TelemetryPing.js
View File

@ -63,6 +63,12 @@ const MEM_HISTOGRAMS = {
"page-faults-hard": "PAGE_FAULTS_HARD"
};
function getLocale() {
return Cc["@mozilla.org/chrome/chrome-registry;1"].
getService(Ci.nsIXULChromeRegistry).
getSelectedLocale('global');
}
XPCOMUtils.defineLazyGetter(this, "Telemetry", function () {
return Cc["@mozilla.org/base/telemetry;1"].getService(Ci.nsITelemetry);
});
@ -143,6 +149,7 @@ function getMetadata(reason) {
appName: ai.name,
appBuildID: ai.appBuildID,
platformBuildID: ai.platformBuildID,
locale: getLocale(),
};
// sysinfo fields is not always available, get what we can.