corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge m-c into inbound

Browse Source
This commit is contained in:
Ehsan Akhgari
2014-01-04 12:14:57 -05:00
parent 258d050570 f75815e241
commit 86c8e10b97
1067 changed files with 5579 additions and 5577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
layout/base/nsCSSFrameConstructor.cpp
View File

@@ -9404,7 +9404,7 @@ nsCSSFrameConstructor::ProcessChildren(nsFrameConstructorState& aState,
if (!aFrame->IsGeneratedContentFrame()) {
nsIContent *badKid = AnyKidsNeedBlockParent(aFrameItems.FirstChild());
nsDependentAtomString parentTag(aContent->Tag()), kidTag(badKid->Tag());
const PRUnichar* params[] = { parentTag.get(), kidTag.get() };
const char16_t* params[] = { parentTag.get(), kidTag.get() };
const nsStyleDisplay *display = frameStyleContext->StyleDisplay();
const char *message =
(display->mDisplay == NS_STYLE_DISPLAY_INLINE_BOX)
@@ -9700,7 +9700,7 @@ FirstLetterCount(const nsTextFragment* aFragment)
int32_t i, n = aFragment->GetLength();
for (i = 0; i < n; i++) {
PRUnichar ch = aFragment->CharAt(i);
char16_t ch = aFragment->CharAt(i);
// FIXME: take content language into account when deciding whitespace.
if (dom::IsSpaceCharacter(ch)) {
if (firstLetterLength) {