mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
4696208ad8
- Bug 1258627 - always schedule next cycle so MDSM has a chance to leave buffering state. r=cpearce. (49fb876b9e) - Bug 1258271 - Remove arguments from MediaDecoderStateMachine::HaveEnoughDecodedAudio(). r=bechen. (e8610f7f76) - Bug 1252753. Part 1 - remove calls to PushFront(). r=kinetik. (7abe1bfb0f) - Bug 1252753. Part 2 - remove MediaDecoderStateMachine::PushFront(). r=kinetik. (1a153a5b00) - Bug 1230527: P1. Ensure seeked event is fired prior loadeddata. r=jwwang (aa9eef9fd3) - Bug 1230527: P2. Add mochitest. r=jwwang (6e9f920781) - Bug 1252767 - Remove MediaDecoderStateMachine::mPendingSeek. r=cpearce. (e5d69a191d) - Bug 1255268 - Replace SeekJob::Steal() with move semantics. r=cpearce. (6294c01ba7) - Bug 1253490 - fix the calculation of decodeTime. r=jya. (b8f3c8801a) - Bug 1252343. Part 1 - make mReader const. r=bechen. (33a8b6a4ad) - Bug 1252343. Part 2 - remove null checks for mReader which is const and never null. r=bechen. (5cd068aafc) - Bug 1250054. Part 2 - employ MediaDecoderReaderWrapper for MDSM and remove code about adjusting start time. r=jya. (b5a954d8d8) - Bug 1252341 - No need to reset mReader in ~MediaDecoderStateMachine() because the destructor will do that. r=bechen. (cd0639e366) - Bug 1264784 - part 2 - remove unused virtual methods from nsIFrame; r=dholbert (5d52314a79) - Bug 1264784 - part 3 - make nsIFrame::GetNearestWidget methods non-virtual; r=dholbert (67b0987de6) - Bug 1053986 - Rename nsIFrame::IsBoxFrame to IsXULBoxFrame. r=dholbert (394613f49f) - Bug 1256040 - Fix some nsGridContainerFrame.h/cpp compile errors in non-unified build. r=dholbert (b49241e3b1) - Bug 1264607 - Treat track size <percentage> values as 'auto' when the grid container size is indefinite. r=dholbert (3895d4d922) - Bug 1260614 - Cleanup grid item iterator Reset() calls. r=dholbert (e6760e1def) - Bug 1256040 - Bustage fix. r=me (d67b9c0de5) - Bug 1233191 part 1 - Implement sanity checks on the flex/grid container child frame list. Remove the anon grid item sanity checks that the frame constructor now does instead. r=dholbert (d9412bb043) - Bug 1233191 part 2 - Remove anon flex item sanity checks that the frame constructor now does instead. r=dholbert (564184ea6d) - Bug 1233191 part 3 - crashtest. (c6b6bb4fca) - Bug 1187846 Stack layout doesn't honour min/max sizes for positioned elements r=Enn (8080e9db71) - Bug 1053986 - Rename nsIFrame::GetMinSize to GetXULMinSize, and related methods. r=dholbert (fa1722982e) - Bug 1000870 - Add some features in testing system. r=smaug (f7b4b8916f) - Bug 1053986 - Rename nsIFrame::GetPrefSize to GetXULPrefSize, and related methods. r=dholbert (9f7e8de26e) - Bug 1053986 - Rename nsIFrame::GetMaxSize to GetXULMaxSize, and related methods. r=dholbert (a632913886) - Bug 1053986 - Rename nsIFrame::GetMinSizeForScrollArea to GetXULMinSizeForScrollArea. r=dholbert (ac520afe6f) - Bug 1053986 - Rename nsIFrame::GetOrdinal to GetXULOrdinal. r=dholbert (e5f7342d03) - Bug 1053986 - Rename nsIFrame::GetFlex to GetXULFlex. r=dholbert (aadf567a8c) - Bug 1053986 - Rename nsIFrame::GetBoxAscent to GetXULBoxAscent. r=dholbert (4e729c60ea) - Bug 1053986 - Rename nsFrame.cpp static method IsBoxWrapped to IsXULBoxWrapped. r=dholbert (009b251df0) - Bug 1053986 - Rename nsIFrame::IsCollapsed to IsXULCollapsed, and related methods. r=dholbert (eec509e378) - Bug 1168212 - Ensure popups have a minimum width of their preferred size r=Enn (657c8da6fa) - Bug 1053986 - Rename nsIFrame::SetBounds to SetXULBounds. r=dholbert (304ff47c6c) - Bug 1088637 - check we get the right transition event, r=Enn (b0da4a67f6) - Bug 1053986 - Rename nsIFrame::Layout to XULLayout, and related methods with the same name. r=dholbert (66ef396b10) - Bug 1053986 - Rename nsIFrame::GetBorderAndPadding to GetXULBorderAndPadding. r=dholbert (588f824000) - Bug 1053986 - Rename nsIFrame::GetBorder to GetXULBorder. r=dholbert (f91ae3fc59) - Bug 1053986 - Rename nsIFrame::GetPadding to GetXULPadding. r=dholbert (797e21e6af) - Bug 1053986 - Rename nsIFrame::GetMargin to GetXULMargin. r=dholbert (05dc0235f2) - Bug 1053986 - Rename nsIFrame::SetLayoutManager to SetXULLayoutManager. r=dholbert (0cb22c411d) - Bug 1053986 - Rename nsIFrame::GetLayoutManager to GetXULLayoutManager. r=dholbert (6a03e1de2c) - Bug 852754 - Part 1: Share the code for limiting scale factors to all image types. r=mstange (098a083d1a) - Bug 852754 - Part 2: Share the implementation of GetContainer. r=mstange (063b7683dd) - Bug 852754 - Part 3: Share the implementation of ConfigureLayer. r=mstange (ffd2d99802) - Bug 1256999 - Pass the right context to new channels for image loads. r=bz r=seth (275cebb231) - Bug 1194337 - Context menu positioned incorrectly on OSX. r=enn (1e429a9d3c) - Bug 1216284 - Tooltips do not flip correctly on OSX. r=enndeakin (c08931768b) - Bug 1053986 - Rename nsIFrame::GetClientRect to GetXULClientRect. r=dholbert (c06a121de6) - Bug 1053986 - Rename nsIFrame::GetVAlign to GetXULVAlign. r=dholbert (a923d76c4b) - Bug 1053986 - Rename nsBox::GetChildBox to GetChildXULBox. r=dholbert (ebe12c77f1) - Bug 1053986 - Rename nsIFrame::GetHAlign to GetXULHAlign. r=dholbert (dbd501e2bd) - Bug 1053986 - Rename nsBox::GetNextBox to GetNextXULBox. r=dholbert (1cd5fa1ce3) - Bug 1053986 - Rename nsBox::GetParentBox to GetParentXULBox. r=dholbert (2beaeb6bdd) - Bug 1171696 - Don't resize scrollbar thumb when updating its position. r=mstange (5b51241744) - Bug 1053986 - Rename nsIFrame::IsHorizontal to IsXULHorizontal, and related methods. r=dholbert (7d8e4142e5) - Bug 1053986 - Rename nsIFrame::IsNormalDirection to IsXULNormalDirection. r=dholbert (7d9686b089) - Bug 1053986 - Rename nsIFrame::Redraw to XULRedraw. r=dholbert (20da19c2ce) - Bug 1053986 - Rename nsIFrame::RelayoutChildAtOrdinal to XULRelayoutChildAtOrdinal. r=dholbert (e5c4eb2b9f) - Bug 1053986 - Rename nsIFrame::SetDebug to SetXULDebug. r=dholbert (438c3a1109) - Bug 1053986 - Rename nsIFrame::GetDebug to GetXULDebug. r=dholbert (00e0ca19e4) - Bug 1053986 - Rename nsIFrame::DumpBox to XULDumpBox. r=dholbert (30edc21d8e) - Bug 1053986 - Rename nsIFrame::AddCSSPrefSize, AddCSSMinSize, AddCSSMaxSize, and AddCSSFlex by replacing CSS with XUL. r=dholbert (4e79b90b1f) - Bug 1053986 - Fix ordering of methods in nsIFrame.h r=dholbert (fb08aa035f) - Bug 1053986 - Rename nsBox::BeginLayout to BeginXULLayout. r=dholbert (595cb70526) - Bug 1053986 - Rename nsBox::EndLayout to EndXULLayout. r=dholbert (13f98a84a0) - Bug 1213895: Part 1 - Correctly support crop="none" in XUL labels. r=neil (053e0c8414) - Bug 1053986 - Rename nsBox::DoLayout to DoXULLayout. r=dholbert (40ef0ece53) - Bug 1144619 - Variable 'nextX' is created in the wrong scope. r=dbaron (7893ccb301) - Bug 1172011 - Remove unneeded 'spaceLeft' declaration from nsSplitterFrame.cpp. r=froydnj (7ef937e283) - Bug 1192376: Make nsImageBoxFrame check whether image size is available before trying to paint an image. r=seth (2db203eb3b) - Bug 1240533 - Parameters to ScreenForRect need to be passed as desktop pixels, not device pixels. r=emk (d49b532344) - Bug 1212658 - Remove needless IsCallerChrome check in nsMenuPopupFrame. r=bz (bdf0d16a49) - Bug 374471 Make the noautohide attribute live where supported r=enndeakin (f696b4d174) - Bug 1200870, allow -1 as a value to popup.moveTo, r=tn (10e05d4240) - Bug 1182856 - Part 1: Add StopTransitionsForElement. r=heycam (1c0ac374c4) - Bug 1182856 - Part 2: Let AnimationsWithDestroyFrame destroy transitions. r=heycam (7820f7b1e5) - Bug 1182856 - Part 3: Cancel transitions for destroy frames. r=heycam (439fb07545) - Bug 1157936 - Put the correct ratio on the scrollbar layer. r=tn (a64f35b9ea) - Bug 1238137 - Telemetry pings for main thread scrollbar-driven scroll input methods. r=kats (89e5187b88) - Bug 1156106 - Make nsMenuBarFrame::mMenuBarListener an nsRefPtr; r=roc (838126cd16) - Bug 1163304 Close all existing popups when menubar becomes active because it should have pseudo focus and other popups shouldn't handle key events r=enn+neil (933c9ae40e) - Bug 1252693 - Assert that we do not tenure into an OMT Zone; r=sfink (0812fc81f2) - Bug 1265679 - Always call the object moved hook in generational GC r=terrence (6d75efba2d) - Bug 1265825 - Remove mSuppressionActive assert. r=kats (3b6b3ba030) - Bug 1250226 - Only report compacting GC telemetry for compacting GCs r=terrence (4e0f511ccf) - Bug 1258578: Improve documentation for js::RelocatablePtr. DONTBUILD r=terrence (3ed2a933e0) - Bug 1252713 - Fix FILES_PER_UNIFIED_FILE=1 bustage in js/. r=terrence (8a97e6c7e2) - Bug 1265741: Fix unified build for fuzzers; r=nbp (ad3b4a4543) - Bug 1013219 - set the line number of the terminating retrval; r=jimb, r=ejpbruel, r=fitzgen (df810884a9) - Bug 1013219 - set line number of return instruction; r=efaust, r=fitzgen, r=ejpbruel (503b1a2bf3) - Bug 1260577 - Fix |obj[expr] += e2| erroneously calling expr.toString() twice. (r=till) (e2485baccb) - Bug 1260577 - followup: Change confusing name SelfAssign to CompoundAssign. (rs=jorendorff) (51a7dee68e) - Bug 1263881 - Check the the number of body level lexicals doesn't exceed that which we can store in Bindings r=shu (d610d7a1e9) - Bug 1258097 - Check for redeclaration of imports by functions r=shu (78f06f273f) - Bug 1264954 - Add missing OOM check in Parser::templateLiteral. r=jonco (2743a82e1e) - Bug 1265313 - Fix Annex B.3.5 handling with body-level lexicals. (r=jorendorff) (6b4139d25b) - Bug 1260620 - Ensure that possibleErrors are not null before attempting to check them; r=jorendorff (6b284c1107) - Bug 1253275 - Remove const_casts from Runtime.cpp. r=sfink (40b6d68455) - Bug 1262731 - Add JS_InitWithFailureDiagnostic(). r=sfink. (310579fcd3) - Bug 1263886 - Don't call makeConstructorCode if the group has unknown properties. r=bhackett (e81c939928) - Bug 1260891 - Acquire and release the lock when destorying an `ExclusiveData<T>`'s protected value; r=terrence a=kwierso (dc39af575e) - Bug 1252034 - Value Numbering: Unconditionally generate fixup blocks. r=sunfish (3b46b2df51) - Bug 1232229 - Ensure generator object prototype is a singleton and tenured. r=jonco (d0c4f17cb6)
266 lines
7.0 KiB
C++
266 lines
7.0 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
//
|
|
// Eric Vaughan
|
|
// Netscape Communications
|
|
//
|
|
// See documentation in associated header file
|
|
//
|
|
|
|
|
|
/*
|
|
* The nsGridRowGroupLayout implements the <rows> or <columns> tag in a grid.
|
|
*/
|
|
|
|
#include "nsGridRowGroupLayout.h"
|
|
#include "nsCOMPtr.h"
|
|
#include "nsIScrollableFrame.h"
|
|
#include "nsBox.h"
|
|
#include "nsBoxLayoutState.h"
|
|
#include "nsGridLayout2.h"
|
|
#include "nsGridRow.h"
|
|
#include "nsHTMLReflowState.h"
|
|
|
|
already_AddRefed<nsBoxLayout> NS_NewGridRowGroupLayout()
|
|
{
|
|
RefPtr<nsBoxLayout> layout = new nsGridRowGroupLayout();
|
|
return layout.forget();
|
|
}
|
|
|
|
nsGridRowGroupLayout::nsGridRowGroupLayout():nsGridRowLayout(), mRowCount(0)
|
|
{
|
|
}
|
|
|
|
nsGridRowGroupLayout::~nsGridRowGroupLayout()
|
|
{
|
|
}
|
|
|
|
void
|
|
nsGridRowGroupLayout::ChildAddedOrRemoved(nsIFrame* aBox, nsBoxLayoutState& aState)
|
|
{
|
|
int32_t index = 0;
|
|
nsGrid* grid = GetGrid(aBox, &index);
|
|
bool isHorizontal = IsXULHorizontal(aBox);
|
|
|
|
if (grid)
|
|
grid->RowAddedOrRemoved(aState, index, isHorizontal);
|
|
}
|
|
|
|
void
|
|
nsGridRowGroupLayout::AddWidth(nsSize& aSize, nscoord aSize2, bool aIsHorizontal)
|
|
{
|
|
nscoord& size = GET_WIDTH(aSize, aIsHorizontal);
|
|
|
|
if (size == NS_INTRINSICSIZE || aSize2 == NS_INTRINSICSIZE)
|
|
size = NS_INTRINSICSIZE;
|
|
else
|
|
size += aSize2;
|
|
}
|
|
|
|
nsSize
|
|
nsGridRowGroupLayout::GetXULPrefSize(nsIFrame* aBox, nsBoxLayoutState& aState)
|
|
{
|
|
nsSize vpref = nsGridRowLayout::GetXULPrefSize(aBox, aState);
|
|
|
|
|
|
/* It is possible that we could have some extra columns. This is when less columns in XUL were
|
|
* defined that needed. And example might be a grid with 3 defined columns but a row with 4 cells in
|
|
* it. We would need an extra column to make the grid work. But because that extra column does not
|
|
* have a box associated with it we must add its size in manually. Remember we could have extra rows
|
|
* as well.
|
|
*/
|
|
|
|
int32_t index = 0;
|
|
nsGrid* grid = GetGrid(aBox, &index);
|
|
|
|
if (grid)
|
|
{
|
|
// make sure we add in extra columns sizes as well
|
|
bool isHorizontal = IsXULHorizontal(aBox);
|
|
int32_t extraColumns = grid->GetExtraColumnCount(isHorizontal);
|
|
int32_t start = grid->GetColumnCount(isHorizontal) - grid->GetExtraColumnCount(isHorizontal);
|
|
for (int32_t i=0; i < extraColumns; i++)
|
|
{
|
|
nscoord pref =
|
|
grid->GetPrefRowHeight(aState, i+start, !isHorizontal); // GetPrefColumnWidth
|
|
|
|
AddWidth(vpref, pref, isHorizontal);
|
|
}
|
|
}
|
|
|
|
return vpref;
|
|
}
|
|
|
|
nsSize
|
|
nsGridRowGroupLayout::GetXULMaxSize(nsIFrame* aBox, nsBoxLayoutState& aState)
|
|
{
|
|
nsSize maxSize = nsGridRowLayout::GetXULMaxSize(aBox, aState);
|
|
|
|
int32_t index = 0;
|
|
nsGrid* grid = GetGrid(aBox, &index);
|
|
|
|
if (grid)
|
|
{
|
|
// make sure we add in extra columns sizes as well
|
|
bool isHorizontal = IsXULHorizontal(aBox);
|
|
int32_t extraColumns = grid->GetExtraColumnCount(isHorizontal);
|
|
int32_t start = grid->GetColumnCount(isHorizontal) - grid->GetExtraColumnCount(isHorizontal);
|
|
for (int32_t i=0; i < extraColumns; i++)
|
|
{
|
|
nscoord max =
|
|
grid->GetMaxRowHeight(aState, i+start, !isHorizontal); // GetMaxColumnWidth
|
|
|
|
AddWidth(maxSize, max, isHorizontal);
|
|
}
|
|
}
|
|
|
|
return maxSize;
|
|
}
|
|
|
|
nsSize
|
|
nsGridRowGroupLayout::GetXULMinSize(nsIFrame* aBox, nsBoxLayoutState& aState)
|
|
{
|
|
nsSize minSize = nsGridRowLayout::GetXULMinSize(aBox, aState);
|
|
|
|
int32_t index = 0;
|
|
nsGrid* grid = GetGrid(aBox, &index);
|
|
|
|
if (grid)
|
|
{
|
|
// make sure we add in extra columns sizes as well
|
|
bool isHorizontal = IsXULHorizontal(aBox);
|
|
int32_t extraColumns = grid->GetExtraColumnCount(isHorizontal);
|
|
int32_t start = grid->GetColumnCount(isHorizontal) - grid->GetExtraColumnCount(isHorizontal);
|
|
for (int32_t i=0; i < extraColumns; i++)
|
|
{
|
|
nscoord min =
|
|
grid->GetMinRowHeight(aState, i+start, !isHorizontal); // GetMinColumnWidth
|
|
AddWidth(minSize, min, isHorizontal);
|
|
}
|
|
}
|
|
|
|
return minSize;
|
|
}
|
|
|
|
/*
|
|
* Run down through our children dirtying them recursively.
|
|
*/
|
|
void
|
|
nsGridRowGroupLayout::DirtyRows(nsIFrame* aBox, nsBoxLayoutState& aState)
|
|
{
|
|
if (aBox) {
|
|
// mark us dirty
|
|
// XXXldb We probably don't want to walk up the ancestor chain
|
|
// calling MarkIntrinsicISizesDirty for every row group.
|
|
aState.PresShell()->FrameNeedsReflow(aBox, nsIPresShell::eTreeChange,
|
|
NS_FRAME_IS_DIRTY);
|
|
nsIFrame* child = nsBox::GetChildXULBox(aBox);
|
|
|
|
while(child) {
|
|
|
|
// walk into scrollframes
|
|
nsIFrame* deepChild = nsGrid::GetScrolledBox(child);
|
|
|
|
// walk into other monuments
|
|
nsIGridPart* monument = nsGrid::GetPartFromBox(deepChild);
|
|
if (monument)
|
|
monument->DirtyRows(deepChild, aState);
|
|
|
|
child = nsBox::GetNextXULBox(child);
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
void
|
|
nsGridRowGroupLayout::CountRowsColumns(nsIFrame* aBox, int32_t& aRowCount, int32_t& aComputedColumnCount)
|
|
{
|
|
if (aBox) {
|
|
int32_t startCount = aRowCount;
|
|
|
|
nsIFrame* child = nsBox::GetChildXULBox(aBox);
|
|
|
|
while(child) {
|
|
|
|
// first see if it is a scrollframe. If so walk down into it and get the scrolled child
|
|
nsIFrame* deepChild = nsGrid::GetScrolledBox(child);
|
|
|
|
nsIGridPart* monument = nsGrid::GetPartFromBox(deepChild);
|
|
if (monument) {
|
|
monument->CountRowsColumns(deepChild, aRowCount, aComputedColumnCount);
|
|
child = nsBox::GetNextXULBox(child);
|
|
deepChild = child;
|
|
continue;
|
|
}
|
|
|
|
child = nsBox::GetNextXULBox(child);
|
|
|
|
// if not a monument. Then count it. It will be a bogus row
|
|
aRowCount++;
|
|
}
|
|
|
|
mRowCount = aRowCount - startCount;
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
* Fill out the given row structure recursively
|
|
*/
|
|
int32_t
|
|
nsGridRowGroupLayout::BuildRows(nsIFrame* aBox, nsGridRow* aRows)
|
|
{
|
|
int32_t rowCount = 0;
|
|
|
|
if (aBox) {
|
|
nsIFrame* child = nsBox::GetChildXULBox(aBox);
|
|
|
|
while(child) {
|
|
|
|
// first see if it is a scrollframe. If so walk down into it and get the scrolled child
|
|
nsIFrame* deepChild = nsGrid::GetScrolledBox(child);
|
|
|
|
nsIGridPart* monument = nsGrid::GetPartFromBox(deepChild);
|
|
if (monument) {
|
|
rowCount += monument->BuildRows(deepChild, &aRows[rowCount]);
|
|
child = nsBox::GetNextXULBox(child);
|
|
deepChild = child;
|
|
continue;
|
|
}
|
|
|
|
aRows[rowCount].Init(child, true);
|
|
|
|
child = nsBox::GetNextXULBox(child);
|
|
|
|
// if not a monument. Then count it. It will be a bogus row
|
|
rowCount++;
|
|
}
|
|
}
|
|
|
|
return rowCount;
|
|
}
|
|
|
|
nsMargin
|
|
nsGridRowGroupLayout::GetTotalMargin(nsIFrame* aBox, bool aIsHorizontal)
|
|
{
|
|
// group have border and padding added to the total margin
|
|
|
|
nsMargin margin = nsGridRowLayout::GetTotalMargin(aBox, aIsHorizontal);
|
|
|
|
// make sure we have the scrollframe on the outside if it has one.
|
|
// that's where the border is.
|
|
aBox = nsGrid::GetScrollBox(aBox);
|
|
|
|
// add our border/padding to it
|
|
nsMargin borderPadding(0,0,0,0);
|
|
aBox->GetXULBorderAndPadding(borderPadding);
|
|
margin += borderPadding;
|
|
|
|
return margin;
|
|
}
|
|
|
|
|