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

Backout ec0dcd401a3f (bug 786108) for crashes

This commit is contained in:
Ed Morley 2012-09-28 22:04:56 +01:00
Родитель 84dd904b86
Коммит d3c2c6f0a2
5 изменённых файлов: 15 добавлений и 130 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

22
layout/style/crashtests/786108-1.html
Просмотреть файл

@ -1,22 +0,0 @@
<html>
<head></head>
<body></body>
<script type="text/javascript">
// Detect severe performance and memory issues when large amounts of errors
// are reported from CSS embedded in a file with a long data URI. Addressed
// by 786108; should finish quickly with that patch and run for a very long
// time otherwise.
var img = new Array;
img.push('<img src="data:image/svg+xml,');
img.push(encodeURIComponent('<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="300px" height="300px">'));
for (var i = 0 ; i < 10000 ; i++)
img.push(encodeURIComponent('<circle cx="0" cy="0" r="1" style="xxx-invalid-property: 0;"/>'));
img.push(encodeURIComponent('</svg>'));
img.push('">');
document.getElementsByTagName('body')[0].innerHTML = img.join('');
</script>
</html>

23
layout/style/crashtests/786108-2.html
Просмотреть файл

@ -1,23 +0,0 @@
<html>
<head></head>
<body></body>
<script type="text/javascript">
// Detect severe performance and memory issues when large amounts of errors
// are reported from CSS embedded in a file with a long data URI. Addressed
// by 786108; should finish quickly with that patch and run for a very long
// time otherwise. This version is designed for slow / memory constrained
// platforms like Android.
var img = new Array;
img.push('<img src="data:image/svg+xml,');
img.push(encodeURIComponent('<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="300px" height="300px">'));
for (var i = 0 ; i < 2500 ; i++)
img.push(encodeURIComponent('<circle cx="0" cy="0" r="1" style="xxx-invalid-property: 0;"/>'));
img.push(encodeURIComponent('</svg>'));
img.push('">');
document.getElementsByTagName('body')[0].innerHTML = img.join('');
</script>
</html>

2
layout/style/crashtests/crashtests.list
Просмотреть файл

@ -77,6 +77,4 @@ load 696188-1.html
load 700116.html
load 729126-1.html
load 729126-2.html
skip-if(Android) load 786108-1.html
load 786108-2.html
load 788836.html

85
layout/style/nsCSSScanner.cpp
Просмотреть файл

@ -249,29 +249,6 @@ nsCSSToken::AppendToString(nsString& aBuffer)
}
}
class DeferredCleanupRunnable : public nsRunnable
{
public:
DeferredCleanupRunnable(nsCSSScanner* aToClean)
: mToClean(aToClean)
{}
NS_IMETHOD Run() {
if (mToClean) {
mToClean->PerformDeferredCleanup();
}
return NS_OK;
}
void Revoke() {
mToClean = nullptr;
}
private:
nsCSSScanner* mToClean;
};
nsCSSScanner::nsCSSScanner()
: mReadPointer(nullptr)
, mSVGMode(false)
@ -294,24 +271,13 @@ nsCSSScanner::nsCSSScanner()
nsCSSScanner::~nsCSSScanner()
{
MOZ_COUNT_DTOR(nsCSSScanner);
Reset();
Close();
if (mLocalPushback != mPushback) {
delete [] mPushback;
}
}
#ifdef CSS_REPORT_PARSE_ERRORS
void
nsCSSScanner::PerformDeferredCleanup()
{
// Clean up all short term caches.
mCachedURI = nullptr;
mCachedFileName.Truncate();
// Release our DeferredCleanupRunnable.
mDeferredCleaner.Forget();
}
#define CSS_ERRORS_PREF "layout.css.report_errors"
static int
@ -365,13 +331,17 @@ nsCSSScanner::Init(const nsAString& aBuffer,
mCount = aBuffer.Length();
#ifdef CSS_REPORT_PARSE_ERRORS
// If aURI is different from mCachedURI, invalidate the filename cache.
if (aURI != mCachedURI) {
mCachedURI = aURI;
mCachedFileName.Truncate();
// If aURI is the same as mURI, no need to reget mFileName -- it
// shouldn't have changed.
if (aURI != mURI) {
mURI = aURI;
if (aURI) {
aURI->GetSpec(mFileName);
} else {
mFileName.Adopt(NS_strdup("from DOM"));
}
}
#endif // CSS_REPORT_PARSE_ERRORS
mLineNumber = aLineNumber;
// Reset variables that we use to keep track of our progress through the input
@ -436,19 +406,8 @@ nsCSSScanner::OutputError()
do_CreateInstance(gScriptErrorFactory, &rv);
if (NS_SUCCEEDED(rv)) {
// Update the cached filename if needed.
if (mCachedFileName.IsEmpty()) {
if (mCachedURI) {
nsAutoCString cFileName;
mCachedURI->GetSpec(cFileName);
CopyUTF8toUTF16(cFileName, mCachedFileName);
} else {
mCachedFileName.AssignLiteral("from DOM");
}
}
rv = errorObject->InitWithWindowID(mError,
mCachedFileName,
NS_ConvertUTF8toUTF16(mFileName),
EmptyString(),
mErrorLineNumber,
mErrorColNumber,
@ -595,37 +554,19 @@ nsCSSScanner::ReportUnexpectedTokenParams(nsCSSToken& tok,
void
nsCSSScanner::Close()
{
Reset();
// Schedule deferred cleanup for cached data. We want to strike a balance
// between performance and memory usage, so we only allow short-term caching.
#ifdef CSS_REPORT_PARSE_ERRORS
if (!mDeferredCleaner.IsPending()) {
mDeferredCleaner = new DeferredCleanupRunnable(this);
if (NS_FAILED(NS_DispatchToCurrentThread(mDeferredCleaner.get()))) {
// Peform the "deferred" cleanup immediately if the dispatch fails.
// This will also have the effect of clearing mDeferredCleaner.
nsCSSScanner::PerformDeferredCleanup();
}
}
#endif
}
void
nsCSSScanner::Reset()
{
mReadPointer = nullptr;
// Clean things up so we don't hold on to memory if our parser gets recycled.
#ifdef CSS_REPORT_PARSE_ERRORS
mFileName.Truncate();
mURI = nullptr;
mError.Truncate();
mInnerWindowID = 0;
mWindowIDCached = false;
mSheet = nullptr;
mLoader = nullptr;
#endif
if (mPushback != mLocalPushback) {
delete [] mPushback;
mPushback = mLocalPushback;

13
layout/style/nsCSSScanner.h
Просмотреть файл

@ -18,7 +18,6 @@
// for #ifdef CSS_REPORT_PARSE_ERRORS
#include "nsXPIDLString.h"
#include "nsThreadUtils.h"
class nsIURI;
// Token types
@ -92,8 +91,6 @@ struct nsCSSToken {
void AppendToString(nsString& aBuffer);
};
class DeferredCleanupRunnable;
// CSS Scanner API. Used to tokenize an input stream using the CSS
// forward compatible tokenization rules. This implementation is
// private to this package and is only used internally by the css
@ -123,9 +120,6 @@ class nsCSSScanner {
}
#ifdef CSS_REPORT_PARSE_ERRORS
// Clean up any reclaimable cached resources.
void PerformDeferredCleanup();
void AddToError(const nsSubstring& aErrorText);
void OutputError();
void ClearError();
@ -134,8 +128,6 @@ class nsCSSScanner {
void ReportUnexpected(const char* aMessage);
private:
void Reset();
void ReportUnexpectedParams(const char* aMessage,
const PRUnichar** aParams,
uint32_t aParamsLength);
@ -219,9 +211,8 @@ protected:
uint32_t mRecordStartOffset;
#ifdef CSS_REPORT_PARSE_ERRORS
nsRevocableEventPtr<DeferredCleanupRunnable> mDeferredCleaner;
nsCOMPtr<nsIURI> mCachedURI; // Used to invalidate the cached filename.
nsString mCachedFileName;
nsXPIDLCString mFileName;
nsCOMPtr<nsIURI> mURI; // Cached so we know to not refetch mFileName
uint32_t mErrorLineNumber, mColNumber, mErrorColNumber;
nsFixedString mError;
PRUnichar mErrorBuf[200];