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

Bug 1197765 - Compare text content inside frame instead of the content node for ruby autohiding. r=dbaron

Browse Source
This commit is contained in:
Xidorn Quan
2015-09-01 09:24:37 +10:00
parent 27b783e6bc
commit f78a9c1678
6 changed files with 64 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
layout/generic/nsRubyBaseContainerFrame.cpp
View File

@@ -13,7 +13,7 @@
#include "mozilla/DebugOnly.h"
#include "mozilla/Maybe.h"
#include "mozilla/WritingModes.h"
#include "nsContentUtils.h"
#include "nsLayoutUtils.h"
#include "nsLineLayout.h"
#include "nsPresContext.h"
#include "nsStyleContext.h"
@@ -609,8 +609,7 @@ nsRubyBaseContainerFrame::ReflowOneColumn(const ReflowState& aReflowState,
nsAutoString baseText;
if (aColumn.mBaseFrame) {
nsContentUtils::GetNodeTextContent(aColumn.mBaseFrame->GetContent(),
true, baseText);
nsLayoutUtils::GetFrameTextContent(aColumn.mBaseFrame, baseText);
}
// Reflow text frames
@@ -618,8 +617,7 @@ nsRubyBaseContainerFrame::ReflowOneColumn(const ReflowState& aReflowState,
nsRubyTextFrame* textFrame = aColumn.mTextFrames[i];
if (textFrame) {
nsAutoString annotationText;
nsContentUtils::GetNodeTextContent(textFrame->GetContent(),
true, annotationText);
nsLayoutUtils::GetFrameTextContent(textFrame, annotationText);
// Per CSS Ruby spec, the content comparison for auto-hiding
// takes place prior to white spaces collapsing (white-space)