mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 23:06:52 +00:00
212144c57f
- Bug 1153936 - nsIHttpChannelInteral attribute to opt out of alt-svc on per channel basis r=hurley (0e5667321) - Bug 1137287 - Part 2: Send non-200/404 synthesized responses via the parent HTTP implementation for proper processing. r=mayhemer (3c38a1908) - Bug 1137287 - Part 0: Test for synthesized redirects. r=jdm (6f12f95de) - Bug 1137287 - Build fix. rs=KWierso for a CLOSED TREE (85694256a) - Bug 1095098 - move do_QueryObject templates into their own header; r=froydnj (5d349c248) - Bug 1095098 - followup - add back some static analysis attributes lost in a rebase; r=me (917a6b5da) - Bug 1159303 - Reduce noise due to sort operations warnings. r=bent (cac3c3e12) - Bug 1164559 - Part 1: Remove instances of #ifdef PR_LOGGING in storage. r=froydnj (5dd0f92b0) - Bug 1164559 - Part 2: Wrap expensive calls in PR_LOG_TEST. r=froydnj (54e94d1ce) - Bug 1148833 part 1 - Remove nsMathMLContainerFrame::WillReflow, reset the NS_MATHML_ERROR bit at the start of Reflow instead. r=roc (803abb8d9) - Bug 1148833 part 2 - Makes sure gLogModule is initialized by calling GetLogModuleInfo(). r=roc (722e2019d) - Bug 1148833 part 3 - Remove nsIFrame::WillReflow and add a non-virtual MarkInReflow method instead that sets NS_FRAME_IN_REFLOW. Call it at the start of Reflow(). r=roc (9cceb221d) - Bug 1148833 part 4 - Fix indentation of some Reflow params (white-space changes only). (b2ba3e18a) - Bug 1158546 - Remove nsDisplayHeaderFooter::mFrame in favor of nsDisplayItem::mFrame; r=roc (f6a20967f) - Bug 1162673 - Part 1: Remove instances of #ifdef PR_LOGGING in layout. r=froydnj (453a452fc) - Bug 1162673 - Part 2: Wrap expensive calls in PR_LOG_TEST. r=froydnj (d745eab19) - Bug 1144031 - fix use of uninitialized variable, r=mcmanus (327dc1af9) - Bug 1144270 : Update remaining callers of newChannel to newChannel2 in netwerk/ (r=mcmanus) (60c21d7cb) - Bug 1161558 cleanup some nsIObserver shutdown paths r=bagder (eb8441bb9) - Bug 1162336 - Part 1: Remove instances of #ifdef PR_LOGGING in netwerk. r=froydnj (8cadc40a2) - Bug 1162336 - Part 2: Wrap expensive calls in PR_LOG_TEST. r=froydnj (4e26e4886) - Bug 1163194 - Part 1: Remove instances of #ifdef PR_LOGGING in dom/xul. r=froydnj (4f840564b) - Bug 1163194 - Part 2: Wrap expensive calls in PR_LOG_TEST. r=froydnj (653707f34) - Bug 1153737: Avoid unnecessary uses of mozilla::pkix::ScopedPtr, r=keeler (fd9eb9aa2) - Bug 1038072 - signature verification for JAR files unpacked into a directory. r=keeler (32469e1dd) - Bug 1124076 - Properly detect certs when loaded and prompt to import them. r=sworkman/dkeeler (d860e3cac) - Bug 1124076 followup - fix the build when PR_LOGGING is not defined. r=mrbkap (657b18bf2) - Bug 1162691 - Part 1: Remove instances of #ifdef PR_LOGGING in security. r=froydnj (98a916e82) - Bug 1162691 - Part 2: Wrap expensive calls in PR_LOG_TEST. r=froydnj (000c2fe42) - bug 1147085 - remove nsINSSCertCache (replace it with nsIX509CertDB.getCerts()) r=Cykesiopka (88f7eba23) - Bug 1149888 - Make PLDHashTable::mRecursionLevel atomic, r=froydnj. Pushing on CLOSED TREE with a=ryanvm. (25d8e2da1) - Bug 1050035 (part 1, attempt 2) - Lazily allocate PLDHashTable::mEntryStore. r=froydnj. (195615f16) - Bug 1159972 - Remove the fallible version of PL_DHashTableInit(). r=froydnj. (d31806eeb)
172 lines
5.6 KiB
C++
172 lines
5.6 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=2 et sw=2 tw=80: */
|
|
/* This Source Code is subject to the terms of the Mozilla Public License
|
|
* version 2.0 (the "License"). You can obtain a copy of the License at
|
|
* http://mozilla.org/MPL/2.0/. */
|
|
|
|
/* rendering object for CSS "display: ruby-text-container" */
|
|
|
|
#include "nsRubyTextContainerFrame.h"
|
|
|
|
#include "mozilla/UniquePtr.h"
|
|
#include "mozilla/WritingModes.h"
|
|
#include "nsPresContext.h"
|
|
#include "nsStyleContext.h"
|
|
|
|
using namespace mozilla;
|
|
|
|
//----------------------------------------------------------------------
|
|
|
|
// Frame class boilerplate
|
|
// =======================
|
|
|
|
NS_QUERYFRAME_HEAD(nsRubyTextContainerFrame)
|
|
NS_QUERYFRAME_ENTRY(nsRubyTextContainerFrame)
|
|
NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame)
|
|
|
|
NS_IMPL_FRAMEARENA_HELPERS(nsRubyTextContainerFrame)
|
|
|
|
nsContainerFrame*
|
|
NS_NewRubyTextContainerFrame(nsIPresShell* aPresShell,
|
|
nsStyleContext* aContext)
|
|
{
|
|
return new (aPresShell) nsRubyTextContainerFrame(aContext);
|
|
}
|
|
|
|
|
|
//----------------------------------------------------------------------
|
|
|
|
// nsRubyTextContainerFrame Method Implementations
|
|
// ===============================================
|
|
|
|
nsIAtom*
|
|
nsRubyTextContainerFrame::GetType() const
|
|
{
|
|
return nsGkAtoms::rubyTextContainerFrame;
|
|
}
|
|
|
|
#ifdef DEBUG_FRAME_DUMP
|
|
nsresult
|
|
nsRubyTextContainerFrame::GetFrameName(nsAString& aResult) const
|
|
{
|
|
return MakeFrameName(NS_LITERAL_STRING("RubyTextContainer"), aResult);
|
|
}
|
|
#endif
|
|
|
|
/* virtual */ bool
|
|
nsRubyTextContainerFrame::IsFrameOfType(uint32_t aFlags) const
|
|
{
|
|
if (aFlags & eSupportsCSSTransforms) {
|
|
return false;
|
|
}
|
|
return nsRubyTextContainerFrameSuper::IsFrameOfType(aFlags);
|
|
}
|
|
|
|
/* virtual */ void
|
|
nsRubyTextContainerFrame::SetInitialChildList(ChildListID aListID,
|
|
nsFrameList& aChildList)
|
|
{
|
|
nsRubyTextContainerFrameSuper::SetInitialChildList(aListID, aChildList);
|
|
UpdateSpanFlag();
|
|
}
|
|
|
|
/* virtual */ void
|
|
nsRubyTextContainerFrame::AppendFrames(ChildListID aListID,
|
|
nsFrameList& aFrameList)
|
|
{
|
|
nsRubyTextContainerFrameSuper::AppendFrames(aListID, aFrameList);
|
|
UpdateSpanFlag();
|
|
}
|
|
|
|
/* virtual */ void
|
|
nsRubyTextContainerFrame::InsertFrames(ChildListID aListID,
|
|
nsIFrame* aPrevFrame,
|
|
nsFrameList& aFrameList)
|
|
{
|
|
nsRubyTextContainerFrameSuper::InsertFrames(aListID, aPrevFrame, aFrameList);
|
|
UpdateSpanFlag();
|
|
}
|
|
|
|
/* virtual */ void
|
|
nsRubyTextContainerFrame::RemoveFrame(ChildListID aListID,
|
|
nsIFrame* aOldFrame)
|
|
{
|
|
nsRubyTextContainerFrameSuper::RemoveFrame(aListID, aOldFrame);
|
|
UpdateSpanFlag();
|
|
}
|
|
|
|
void
|
|
nsRubyTextContainerFrame::UpdateSpanFlag()
|
|
{
|
|
bool isSpan = false;
|
|
// The continuation checks are safe here because spans never break.
|
|
if (!GetPrevContinuation() && !GetNextContinuation()) {
|
|
nsIFrame* onlyChild = mFrames.OnlyChild();
|
|
if (onlyChild && onlyChild->IsPseudoFrame(GetContent())) {
|
|
// Per CSS Ruby spec, if the only child of an rtc frame is
|
|
// a pseudo rt frame, it spans all bases in the segment.
|
|
isSpan = true;
|
|
}
|
|
}
|
|
|
|
if (isSpan) {
|
|
AddStateBits(NS_RUBY_TEXT_CONTAINER_IS_SPAN);
|
|
} else {
|
|
RemoveStateBits(NS_RUBY_TEXT_CONTAINER_IS_SPAN);
|
|
}
|
|
}
|
|
|
|
/* virtual */ void
|
|
nsRubyTextContainerFrame::Reflow(nsPresContext* aPresContext,
|
|
nsHTMLReflowMetrics& aDesiredSize,
|
|
const nsHTMLReflowState& aReflowState,
|
|
nsReflowStatus& aStatus)
|
|
{
|
|
MarkInReflow();
|
|
DO_GLOBAL_REFLOW_COUNT("nsRubyTextContainerFrame");
|
|
DISPLAY_REFLOW(aPresContext, this, aReflowState, aDesiredSize, aStatus);
|
|
|
|
// Although a ruby text container may have continuations, returning
|
|
// NS_FRAME_COMPLETE here is still safe, since its parent, ruby frame,
|
|
// ignores the status, and continuations of the ruby base container
|
|
// will take care of our continuations.
|
|
aStatus = NS_FRAME_COMPLETE;
|
|
WritingMode lineWM = aReflowState.mLineLayout->GetWritingMode();
|
|
|
|
nscoord minBCoord = nscoord_MAX;
|
|
nscoord maxBCoord = nscoord_MIN;
|
|
for (nsFrameList::Enumerator e(mFrames); !e.AtEnd(); e.Next()) {
|
|
nsIFrame* child = e.get();
|
|
MOZ_ASSERT(child->GetType() == nsGkAtoms::rubyTextFrame);
|
|
// The container width is still unknown yet.
|
|
LogicalRect rect = child->GetLogicalRect(lineWM, 0);
|
|
LogicalMargin margin = child->GetLogicalUsedMargin(lineWM);
|
|
nscoord blockStart = rect.BStart(lineWM) - margin.BStart(lineWM);
|
|
minBCoord = std::min(minBCoord, blockStart);
|
|
nscoord blockEnd = rect.BEnd(lineWM) + margin.BEnd(lineWM);
|
|
maxBCoord = std::max(maxBCoord, blockEnd);
|
|
}
|
|
|
|
MOZ_ASSERT(minBCoord <= maxBCoord || mFrames.IsEmpty());
|
|
LogicalSize size(lineWM, mISize, 0);
|
|
if (!mFrames.IsEmpty()) {
|
|
size.BSize(lineWM) = maxBCoord - minBCoord;
|
|
nscoord containerWidth = size.Width(lineWM);
|
|
for (nsFrameList::Enumerator e(mFrames); !e.AtEnd(); e.Next()) {
|
|
nsIFrame* child = e.get();
|
|
// We reflowed the child with container width 0, as the true width
|
|
// was not yet known at that time.
|
|
LogicalPoint pos = child->GetLogicalPosition(lineWM, 0);
|
|
// Adjust block position to account for minBCoord,
|
|
// then reposition child based on the true container width.
|
|
pos.B(lineWM) -= minBCoord;
|
|
// Relative positioning hasn't happened yet.
|
|
// So MovePositionBy should not be used here.
|
|
child->SetPosition(lineWM, pos, containerWidth);
|
|
nsContainerFrame::PlaceFrameView(child);
|
|
}
|
|
}
|
|
|
|
aDesiredSize.SetSize(lineWM, size);
|
|
}
|