author | L. David Baron <dbaron@dbaron.org> |
Sun, 17 Feb 2013 22:56:32 -0800 | |
changeset 122207 | 2b8d67b35d8292c9363bd80ed06a1c6542db4e3a |
parent 122206 | 43fa20226909036be7d36f1605dc70d0c47dc384 |
child 122208 | 4fa2028f2e3c8b926018621b8efcf5eb5facb09b |
push id | 24322 |
push user | dbaron@mozilla.com |
push date | Mon, 18 Feb 2013 08:55:11 +0000 |
treeherder | mozilla-central@0acbd06d48a9 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | bzbarsky |
bugs | 563195 |
milestone | 21.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/layout/style/Loader.cpp +++ b/layout/style/Loader.cpp @@ -1134,17 +1134,17 @@ Loader::CreateSheet(nsIURI* aURI, &debugEqual)) && debugEqual), "Principals should be the same"); #endif } // Then alternate sheets if (!sheet) { aSheetState = eSheetPending; - SheetLoadData* loadData = nullptr; + loadData = nullptr; mPendingDatas.Get(&key, &loadData); if (loadData) { sheet = loadData->mSheet; LOG((" From pending: %p", sheet.get())); #ifdef DEBUG bool debugEqual; NS_ASSERTION((!aLoaderPrincipal && !loadData->mLoaderPrincipal) ||
--- a/layout/style/nsCSSValue.h +++ b/layout/style/nsCSSValue.h @@ -30,40 +30,40 @@ class nsPresContext; class nsIURI; template <class T> class nsPtrHashKey; // Deletes a linked list iteratively to avoid blowing up the stack (bug 456196). #define NS_CSS_DELETE_LIST_MEMBER(type_, ptr_, member_) \ { \ type_ *cur = (ptr_)->member_; \ - (ptr_)->member_ = nullptr; \ + (ptr_)->member_ = nullptr; \ while (cur) { \ - type_ *next = cur->member_; \ - cur->member_ = nullptr; \ + type_ *dlm_next = cur->member_; \ + cur->member_ = nullptr; \ delete cur; \ - cur = next; \ + cur = dlm_next; \ } \ } // Clones a linked list iteratively to avoid blowing up the stack. // If it fails to clone the entire list then 'to_' is deleted and // we return null. #define NS_CSS_CLONE_LIST_MEMBER(type_, from_, member_, to_, args_) \ { \ type_ *dest = (to_); \ - (to_)->member_ = nullptr; \ + (to_)->member_ = nullptr; \ for (const type_ *src = (from_)->member_; src; src = src->member_) { \ - type_ *clone = src->Clone args_; \ - if (!clone) { \ + type_ *clm_clone = src->Clone args_; \ + if (!clm_clone) { \ delete (to_); \ - return nullptr; \ + return nullptr; \ } \ - dest->member_ = clone; \ - dest = clone; \ + dest->member_ = clm_clone; \ + dest = clm_clone; \ } \ } namespace mozilla { namespace css { struct URLValue { // Methods are not inline because using an nsIPrincipal means requiring
--- a/layout/style/nsFontFaceLoader.cpp +++ b/layout/style/nsFontFaceLoader.cpp @@ -726,49 +726,49 @@ nsUserFontSet::LogMessage(gfxMixedFontFa nsCSSProps::kFontWeightKTable); if (weightKeywordString.Length() > 0) { weightKeyword = weightKeywordString.get(); } else { sprintf(weightKeywordBuf, "%u", aProxy->Weight()); weightKeyword = weightKeywordBuf; } - nsPrintfCString - msg("downloadable font: %s " + nsPrintfCString message + ("downloadable font: %s " "(font-family: \"%s\" style:%s weight:%s stretch:%s src index:%d)", aMessage, familyName.get(), aProxy->IsItalic() ? "italic" : "normal", weightKeyword, nsCSSProps::ValueToKeyword(aProxy->Stretch(), nsCSSProps::kFontStretchKTable).get(), aProxy->mSrcIndex); if (NS_FAILED(aStatus)) { - msg.Append(": "); + message.Append(": "); switch (aStatus) { case NS_ERROR_DOM_BAD_URI: - msg.Append("bad URI or cross-site access not allowed"); + message.Append("bad URI or cross-site access not allowed"); break; case NS_ERROR_CONTENT_BLOCKED: - msg.Append("content blocked"); + message.Append("content blocked"); break; default: - msg.Append("status="); - msg.AppendInt(static_cast<uint32_t>(aStatus)); + message.Append("status="); + message.AppendInt(static_cast<uint32_t>(aStatus)); break; } } - msg.Append("\nsource: "); - msg.Append(fontURI); + message.Append("\nsource: "); + message.Append(fontURI); #ifdef PR_LOGGING if (PR_LOG_TEST(GetUserFontsLog(), PR_LOG_DEBUG)) { PR_LOG(GetUserFontsLog(), PR_LOG_DEBUG, - ("userfonts (%p) %s", this, msg.get())); + ("userfonts (%p) %s", this, message.get())); } #endif // try to give the user an indication of where the rule came from nsCSSFontFaceRule* rule = FindRuleForEntry(aProxy); nsString href; nsString text; nsresult rv; @@ -782,17 +782,17 @@ nsUserFontSet::LogMessage(gfxMixedFontFa NS_ENSURE_SUCCESS(rv, rv); } nsCOMPtr<nsIScriptError> scriptError = do_CreateInstance(NS_SCRIPTERROR_CONTRACTID, &rv); NS_ENSURE_SUCCESS(rv, rv); uint64_t innerWindowID = GetPresContext()->Document()->InnerWindowID(); - rv = scriptError->InitWithWindowID(NS_ConvertUTF8toUTF16(msg), + rv = scriptError->InitWithWindowID(NS_ConvertUTF8toUTF16(message), href, // file text, // src line 0, 0, // line & column number aFlags, // flags "CSS Loader", // category (make separate?) innerWindowID); if (NS_SUCCEEDED(rv)) { console->LogMessage(scriptError);
--- a/layout/style/nsRuleNode.cpp +++ b/layout/style/nsRuleNode.cpp @@ -3936,32 +3936,32 @@ nsRuleNode::ComputeTextResetData(void* a text->mTextOverflow.mRight.mType = NS_STYLE_TEXT_OVERFLOW_STRING; textOverflowValue->GetStringValue(text->mTextOverflow.mRight.mString); text->mTextOverflow.mLeft.mType = NS_STYLE_TEXT_OVERFLOW_CLIP; text->mTextOverflow.mLeft.mString.Truncate(); text->mTextOverflow.mLogicalDirections = true; } else if (eCSSUnit_Pair == textOverflowValue->GetUnit()) { // Two values were specified. text->mTextOverflow.mLogicalDirections = false; - const nsCSSValuePair& textOverflowValue = - aRuleData->ValueForTextOverflow()->GetPairValue(); - - const nsCSSValue *textOverflowLeftValue = &textOverflowValue.mXValue; + const nsCSSValuePair& textOverflowValuePair = + textOverflowValue->GetPairValue(); + + const nsCSSValue *textOverflowLeftValue = &textOverflowValuePair.mXValue; if (eCSSUnit_Enumerated == textOverflowLeftValue->GetUnit()) { SetDiscrete(*textOverflowLeftValue, text->mTextOverflow.mLeft.mType, canStoreInRuleTree, SETDSC_ENUMERATED, parentText->mTextOverflow.mLeft.mType, NS_STYLE_TEXT_OVERFLOW_CLIP, 0, 0, 0, 0); text->mTextOverflow.mLeft.mString.Truncate(); } else if (eCSSUnit_String == textOverflowLeftValue->GetUnit()) { textOverflowLeftValue->GetStringValue(text->mTextOverflow.mLeft.mString); text->mTextOverflow.mLeft.mType = NS_STYLE_TEXT_OVERFLOW_STRING; } - const nsCSSValue *textOverflowRightValue = &textOverflowValue.mYValue; + const nsCSSValue *textOverflowRightValue = &textOverflowValuePair.mYValue; if (eCSSUnit_Enumerated == textOverflowRightValue->GetUnit()) { SetDiscrete(*textOverflowRightValue, text->mTextOverflow.mRight.mType, canStoreInRuleTree, SETDSC_ENUMERATED, parentText->mTextOverflow.mRight.mType, NS_STYLE_TEXT_OVERFLOW_CLIP, 0, 0, 0, 0); text->mTextOverflow.mRight.mString.Truncate(); } else if (eCSSUnit_String == textOverflowRightValue->GetUnit()) { textOverflowRightValue->GetStringValue(text->mTextOverflow.mRight.mString);