mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
f3297ff565
- Bug 1161802 part 1 - Add FullscreenChanged callback in WidgetListener. r=roc (caee485f4) - Bug 1058712, e10s, support for copy image command, r=ehsan,mconley (42d1bcc2c) - Bug 1122090 - Make ContentHelper take a LayoutDeviceIntPoint instead of an nsIntPoint. r=botond (21588cadb) - Bug 1122090 - Send the allowed behaviour notification to APZ for touch blocks when touch-action is enabled. r=botond (5bb0aad4a) - remove unneeded include (b77797920) - Add wheel transaction support to APZ. (bug 1142866 part 1, r=kats) (a4ed2150a) - End APZ wheel transactions when the mouse moves out of frame. (bug 1142866 part 2, r=kats,botond) (b26b0eb89) - Add APZ support for test.mousescroll callbacks. (bug 1142866 part 3, r=kats) (424ef3ad7) - Add helper for applying async transforms to widget input events. (bug 1143567 part 1, r=kats) (221cf7b02) - Ensure input events account for APZ transforms on Gtk. (bug 1143567 part 2, r=kats) (a62991076) - Allow synthetic input events to be dispatched asynchronously. (bug 1146243, r=kats) (0878aac4e) - Bug 1120300 - Export WritingModes.h as mozilla/WritingModes.h. r=jfkthame (67838dec2) - Bug 1075670 - Make event.screen[XY] work in content processes (r=smaug,kats,tn,joshmoz) (7c800e2a1) - Bug 1150563 - Intermittent test_compartments.js | test_measure - [test_measure : 125] At least 10ms counted for built-in statistics (0) - false == true;r=yoric (72ce9c7fc) - Bug 1143847 - Fix bogus asserts in x64 Assembler::finish(). r=sunfish (36aecaf48) - pointer style (a1a5a7b0f) - Bug 1148232 - OdinMonkey: Mark x86 disassembler code as MOZ_COLD and use MOZ_RELEASE_ASSERT r=luke (346cf1fdd) - Bug 1148232 - OdinMonkey: Update an asm.js error message r=luke (98c72b0b1) - Bug 1148232 - OdinMonkey: Update tests to avoid using legacy syntax. r=luke (d212510f3) - Bug 1148232 - OdinMonkey: Misc CheckArrayAccess cleanups r=luke (e5cda1cf0) - pointer style (23135ba24) - Bug 1148232 - OdinMonkey: Always put asm.js heap alignment masks just before their accesses r=luke (d604adf5d) - pointer style (9a5d58741) - Bug 1148232 - IonMonkey: Delete unused code r=luke (ea5bc5edc) - pointer style (73be379e1) - Bug 1143704 part 1 - Make Emit1/Emit2 return bool instead of ptrdiff_t. r=luke (2ca42caa9) - pointer style (eb30078f0) - Bug 1143704 part 2 - Make Emit3/EmitCall/EmitBackPatchOp return bool instead of ptrdiff_t. r=jorendorff (7275c56af) - Bug 1143704 part 3 - Make EmitLoopHead return bool instead of ptrdiff_t. r=shu (aff098096) - Bug 1143704 part 4 - Turn Emit1 into a BytecodeEmitter method. r=bhackett (5ca0356ba) - Bug 1143704 part 5 - Add a cx member to BytecodeEmitter. r=Waldo (8ce42c388) - Bug 1143704 part 6 - Move more functions into BytecodeEmitter. r=efaust (b26f60b2f) - pointer style (39e0e76ab) - Bug 1143704 part 7 - Move more functions into BytecodeEmitter. r=bhackett (7397bc2e5) - pointer style (f08664ab1) - Bug 1143704 part 8 - Move more functions into BytecodeEmitter. r=luke (2b0411545) - pointer style (5042217ea) - Bug 1143704 part 9 - Move more functions into BytecodeEmitter. r=shu (97501236a) - pointer style (4248e54fa) - Bug 1143704 part 10 - Move more functions into BytecodeEmitter. r=efaust (cd1fcb6a4) - pointer style (06026238e) - Bug 1143704 part 11 - Move more functions into BytecodeEmitter. r=jorendorff (300cdd416) - Bug 1145491 part 1. Only do the fast path for JSOP_BINDGNAME when the script doesn't have a polluted global. r=luke,jandem (75d663d20) - Bug 1145491 part 2. Only do the fast path for JSOP_GETGNAME when the script doesn't have a polluted global. r=luke,jandem (776bb0b37) - Bug 1145491 part 3. Only do the fast path for JSOP_SETGNAME and JSOP_STRICTSETGNAME when the script doesn't have a polluted global. r=luke,jandem (dfc5781e2) - Bug 537013 - Make the find bar exist on a per-tab basis. r=dao (cf361fd57) - Bug 1145491 part 4. Emit JSOP_IMPLICITTHIS for JSOP_GETGNAME as well, because otherwise bareword calls in polluted-global scripts won't work right. r=luk (2a4c829e2) - Bug 1145491 part 5. Fix up various other places that check for JSOP_GET/SETNAME without checking for the GNAME versions too. r=luke (08ebda6b5) - pointer style (dbdd1393a) - Bug 1145491 part 6. Fix script cloning to propagate the polluted-global-scope state to the lambda templates in the script. r=luke (a0c85b629) - pointer style (906b885ff) - Bug 1145491 part 7. Stop checking compileAndGo before emitting GNAME ops. r=luke (33e64a432)
333 lines
10 KiB
C++
333 lines
10 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/. */
|
|
|
|
/* struct containing the output from nsIFrame::Reflow */
|
|
|
|
#ifndef nsHTMLReflowMetrics_h___
|
|
#define nsHTMLReflowMetrics_h___
|
|
|
|
#include "mozilla/WritingModes.h"
|
|
#include "nsBoundingMetrics.h"
|
|
#include "nsRect.h"
|
|
|
|
//----------------------------------------------------------------------
|
|
|
|
struct nsHTMLReflowState;
|
|
|
|
// Option flags
|
|
#define NS_REFLOW_CALC_BOUNDING_METRICS 0x0001
|
|
|
|
/**
|
|
* When we store overflow areas as an array of scrollable and visual
|
|
* overflow, we use these indices.
|
|
*
|
|
* eOverflowType_LENGTH is needed (for gcc 4.5.*, at least) to ensure
|
|
* that 2 is a valid value of nsOverflowType for use in
|
|
* NS_FOR_FRAME_OVERFLOW_TYPES.
|
|
*/
|
|
enum nsOverflowType { eVisualOverflow, eScrollableOverflow,
|
|
eOverflowType_LENGTH };
|
|
|
|
#define NS_FOR_FRAME_OVERFLOW_TYPES(var_) \
|
|
for (nsOverflowType var_ = nsOverflowType(0); var_ < 2; \
|
|
var_ = nsOverflowType(var_ + 1))
|
|
|
|
struct nsOverflowAreas {
|
|
private:
|
|
nsRect mRects[2];
|
|
public:
|
|
nsRect& Overflow(size_t aIndex) {
|
|
NS_ASSERTION(aIndex < 2, "index out of range");
|
|
return mRects[aIndex];
|
|
}
|
|
const nsRect& Overflow(size_t aIndex) const {
|
|
NS_ASSERTION(aIndex < 2, "index out of range");
|
|
return mRects[aIndex];
|
|
}
|
|
|
|
nsRect& VisualOverflow() { return mRects[eVisualOverflow]; }
|
|
const nsRect& VisualOverflow() const { return mRects[eVisualOverflow]; }
|
|
|
|
nsRect& ScrollableOverflow() { return mRects[eScrollableOverflow]; }
|
|
const nsRect& ScrollableOverflow() const { return mRects[eScrollableOverflow]; }
|
|
|
|
nsOverflowAreas() {
|
|
// default-initializes to zero due to nsRect's default constructor
|
|
}
|
|
|
|
nsOverflowAreas(const nsRect& aVisualOverflow,
|
|
const nsRect& aScrollableOverflow)
|
|
{
|
|
mRects[eVisualOverflow] = aVisualOverflow;
|
|
mRects[eScrollableOverflow] = aScrollableOverflow;
|
|
}
|
|
|
|
nsOverflowAreas(const nsOverflowAreas& aOther) {
|
|
*this = aOther;
|
|
}
|
|
|
|
nsOverflowAreas& operator=(const nsOverflowAreas& aOther) {
|
|
mRects[0] = aOther.mRects[0];
|
|
mRects[1] = aOther.mRects[1];
|
|
return *this;
|
|
}
|
|
|
|
bool operator==(const nsOverflowAreas& aOther) const {
|
|
// Scrollable overflow is a point-set rectangle and visual overflow
|
|
// is a pixel-set rectangle.
|
|
return VisualOverflow().IsEqualInterior(aOther.VisualOverflow()) &&
|
|
ScrollableOverflow().IsEqualEdges(aOther.ScrollableOverflow());
|
|
}
|
|
|
|
bool operator!=(const nsOverflowAreas& aOther) const {
|
|
return !(*this == aOther);
|
|
}
|
|
|
|
nsOverflowAreas operator+(const nsPoint& aPoint) const {
|
|
nsOverflowAreas result(*this);
|
|
result += aPoint;
|
|
return result;
|
|
}
|
|
|
|
nsOverflowAreas& operator+=(const nsPoint& aPoint) {
|
|
mRects[0] += aPoint;
|
|
mRects[1] += aPoint;
|
|
return *this;
|
|
}
|
|
|
|
void Clear() {
|
|
mRects[0].SetRect(0, 0, 0, 0);
|
|
mRects[1].SetRect(0, 0, 0, 0);
|
|
}
|
|
|
|
// Mutates |this| by unioning both overflow areas with |aOther|.
|
|
void UnionWith(const nsOverflowAreas& aOther);
|
|
|
|
// Mutates |this| by unioning both overflow areas with |aRect|.
|
|
void UnionAllWith(const nsRect& aRect);
|
|
|
|
// Mutates |this| by setting both overflow areas to |aRect|.
|
|
void SetAllTo(const nsRect& aRect);
|
|
};
|
|
|
|
/**
|
|
* An nsCollapsingMargin represents a vertical collapsing margin between
|
|
* blocks as described in section 8.3.1 of CSS2,
|
|
* <URL: http://www.w3.org/TR/REC-CSS2/box.html#collapsing-margins >.
|
|
*
|
|
* All adjacent vertical margins collapse, and the resulting margin is
|
|
* the sum of the largest positive margin included and the smallest (most
|
|
* negative) negative margin included.
|
|
*/
|
|
struct nsCollapsingMargin {
|
|
private:
|
|
nscoord mMostPos; // the largest positive margin included
|
|
nscoord mMostNeg; // the smallest negative margin included
|
|
|
|
public:
|
|
nsCollapsingMargin()
|
|
: mMostPos(0),
|
|
mMostNeg(0)
|
|
{
|
|
}
|
|
|
|
nsCollapsingMargin(const nsCollapsingMargin& aOther)
|
|
: mMostPos(aOther.mMostPos),
|
|
mMostNeg(aOther.mMostNeg)
|
|
{
|
|
}
|
|
|
|
bool operator==(const nsCollapsingMargin& aOther)
|
|
{
|
|
return mMostPos == aOther.mMostPos &&
|
|
mMostNeg == aOther.mMostNeg;
|
|
}
|
|
|
|
bool operator!=(const nsCollapsingMargin& aOther)
|
|
{
|
|
return !(*this == aOther);
|
|
}
|
|
|
|
nsCollapsingMargin& operator=(const nsCollapsingMargin& aOther)
|
|
{
|
|
mMostPos = aOther.mMostPos;
|
|
mMostNeg = aOther.mMostNeg;
|
|
return *this;
|
|
}
|
|
|
|
void Include(nscoord aCoord)
|
|
{
|
|
if (aCoord > mMostPos)
|
|
mMostPos = aCoord;
|
|
else if (aCoord < mMostNeg)
|
|
mMostNeg = aCoord;
|
|
}
|
|
|
|
void Include(const nsCollapsingMargin& aOther)
|
|
{
|
|
if (aOther.mMostPos > mMostPos)
|
|
mMostPos = aOther.mMostPos;
|
|
if (aOther.mMostNeg < mMostNeg)
|
|
mMostNeg = aOther.mMostNeg;
|
|
}
|
|
|
|
void Zero()
|
|
{
|
|
mMostPos = 0;
|
|
mMostNeg = 0;
|
|
}
|
|
|
|
bool IsZero() const
|
|
{
|
|
return (mMostPos == 0) && (mMostNeg == 0);
|
|
}
|
|
|
|
nscoord get() const
|
|
{
|
|
return mMostPos + mMostNeg;
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Reflow metrics used to return the frame's desired size and alignment
|
|
* information.
|
|
*
|
|
* @see #Reflow()
|
|
*/
|
|
class nsHTMLReflowMetrics {
|
|
public:
|
|
// XXXldb Should |aFlags| generally be passed from parent to child?
|
|
// Some places do it, and some don't. |aFlags| should perhaps go away
|
|
// entirely.
|
|
// XXX width/height/ascent are OUT parameters and so they shouldn't
|
|
// have to be initialized, but there are some bad frame classes that
|
|
// aren't properly setting them when returning from Reflow()...
|
|
explicit nsHTMLReflowMetrics(mozilla::WritingMode aWritingMode, uint32_t aFlags = 0)
|
|
: mISize(0)
|
|
, mBSize(0)
|
|
, mBlockStartAscent(ASK_FOR_BASELINE)
|
|
, mFlags(aFlags)
|
|
, mWritingMode(aWritingMode)
|
|
{}
|
|
|
|
explicit nsHTMLReflowMetrics(const nsHTMLReflowState& aState, uint32_t aFlags = 0);
|
|
|
|
// ISize and BSize are logical-coordinate dimensions:
|
|
// ISize is the size in the writing mode's inline direction (which equates to
|
|
// width in horizontal writing modes, height in vertical ones), and BSize is
|
|
// the size in the block-progression direction.
|
|
nscoord ISize(mozilla::WritingMode aWritingMode) const {
|
|
CHECK_WRITING_MODE(aWritingMode);
|
|
return mISize;
|
|
}
|
|
nscoord BSize(mozilla::WritingMode aWritingMode) const {
|
|
CHECK_WRITING_MODE(aWritingMode);
|
|
return mBSize;
|
|
}
|
|
mozilla::LogicalSize Size(mozilla::WritingMode aWritingMode) const {
|
|
CHECK_WRITING_MODE(aWritingMode);
|
|
return mozilla::LogicalSize(aWritingMode, mISize, mBSize);
|
|
}
|
|
|
|
nscoord& ISize(mozilla::WritingMode aWritingMode) {
|
|
CHECK_WRITING_MODE(aWritingMode);
|
|
return mISize;
|
|
}
|
|
nscoord& BSize(mozilla::WritingMode aWritingMode) {
|
|
CHECK_WRITING_MODE(aWritingMode);
|
|
return mBSize;
|
|
}
|
|
|
|
// Set inline and block size from a LogicalSize, converting to our
|
|
// writing mode as necessary.
|
|
void SetSize(mozilla::WritingMode aWM, mozilla::LogicalSize aSize)
|
|
{
|
|
mozilla::LogicalSize convertedSize = aSize.ConvertTo(mWritingMode, aWM);
|
|
mBSize = convertedSize.BSize(mWritingMode);
|
|
mISize = convertedSize.ISize(mWritingMode);
|
|
}
|
|
|
|
// Set both inline and block size to zero -- no need for a writing mode!
|
|
void ClearSize()
|
|
{
|
|
mISize = mBSize = 0;
|
|
}
|
|
|
|
// Width and Height are physical dimensions, independent of writing mode.
|
|
// Accessing these is slightly more expensive than accessing the logical
|
|
// dimensions (once vertical writing mode support is enabled); as far as
|
|
// possible, client code should work purely with logical dimensions.
|
|
nscoord Width() const { return mWritingMode.IsVertical() ? mBSize : mISize; }
|
|
nscoord Height() const { return mWritingMode.IsVertical() ? mISize : mBSize; }
|
|
|
|
// It's only meaningful to consider "ascent" on the block-start side of the
|
|
// frame, so no need to pass a writing mode argument
|
|
nscoord BlockStartAscent() const
|
|
{
|
|
return mBlockStartAscent;
|
|
}
|
|
|
|
nscoord& Width() { return mWritingMode.IsVertical() ? mBSize : mISize; }
|
|
nscoord& Height() { return mWritingMode.IsVertical() ? mISize : mBSize; }
|
|
|
|
void SetBlockStartAscent(nscoord aAscent)
|
|
{
|
|
mBlockStartAscent = aAscent;
|
|
}
|
|
|
|
enum { ASK_FOR_BASELINE = nscoord_MAX };
|
|
|
|
// Metrics that _exactly_ enclose the text to allow precise MathML placements.
|
|
// If the NS_REFLOW_CALC_BOUNDING_METRICS flag is set, then the caller is
|
|
// requesting that you also compute additional details about your inner
|
|
// bounding box and italic correction. For example, the bounding box of
|
|
// msup is the smallest rectangle that _exactly_ encloses both the text
|
|
// of the base and the text of the superscript.
|
|
nsBoundingMetrics mBoundingMetrics; // [OUT]
|
|
|
|
// Carried out block-end margin values. This is the collapsed
|
|
// (generational) block-end margin value.
|
|
nsCollapsingMargin mCarriedOutBEndMargin;
|
|
|
|
// For frames that have content that overflow their content area
|
|
// (HasOverflowAreas() is true) these rectangles represent the total
|
|
// area of the frame including visible overflow, i.e., don't include
|
|
// overflowing content that is hidden. The rects are in the local
|
|
// coordinate space of the frame, and should be at least as big as the
|
|
// desired size. If there is no content that overflows, then the
|
|
// overflow area is identical to the desired size and should be {0, 0,
|
|
// width, height}.
|
|
nsOverflowAreas mOverflowAreas;
|
|
|
|
nsRect& VisualOverflow()
|
|
{ return mOverflowAreas.VisualOverflow(); }
|
|
const nsRect& VisualOverflow() const
|
|
{ return mOverflowAreas.VisualOverflow(); }
|
|
nsRect& ScrollableOverflow()
|
|
{ return mOverflowAreas.ScrollableOverflow(); }
|
|
const nsRect& ScrollableOverflow() const
|
|
{ return mOverflowAreas.ScrollableOverflow(); }
|
|
|
|
// Set all of mOverflowAreas to (0, 0, width, height).
|
|
void SetOverflowAreasToDesiredBounds();
|
|
|
|
// Union all of mOverflowAreas with (0, 0, width, height).
|
|
void UnionOverflowAreasWithDesiredBounds();
|
|
|
|
mozilla::WritingMode GetWritingMode() const { return mWritingMode; }
|
|
|
|
private:
|
|
nscoord mISize, mBSize; // [OUT] desired width and height (border-box)
|
|
nscoord mBlockStartAscent; // [OUT] baseline (in Block direction), or ASK_FOR_BASELINE
|
|
|
|
public:
|
|
uint32_t mFlags;
|
|
|
|
private:
|
|
mozilla::WritingMode mWritingMode;
|
|
};
|
|
|
|
#endif /* nsHTMLReflowMetrics_h___ */
|