Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1456114 - Update for WR PR 2679. r=jrmuizel

Browse Source 
MozReview-Commit-ID: GrFwU62DcWU

--HG--
extra : rebase_source : bacebaedb5870063f30053def14fe5ab49954925
This commit is contained in:
Kartikaya Gupta 2018-04-26 14:15:19 -04:00
parent 8248fea792
commit b881108e5b
4 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/layers/wr/WebRenderBridgeChild.cpp
View File

@ -272,7 +272,7 @@ WriteFontDescriptor(const uint8_t* aData, uint32_t aLength, uint32_t aIndex,
void
WebRenderBridgeChild::PushGlyphs(wr::DisplayListBuilder& aBuilder, Range<const wr::GlyphInstance> aGlyphs,
gfx::ScaledFont* aFont, const wr::ColorF& aColor, const StackingContextHelper& aSc,
const wr::LayerRect& aBounds, const wr::LayerRect& aClip, bool aBackfaceVisible,
const wr::LayoutRect& aBounds, const wr::LayoutRect& aClip, bool aBackfaceVisible,
const wr::GlyphOptions* aGlyphOptions)
{
MOZ_ASSERT(aFont);

2
gfx/layers/wr/WebRenderBridgeChild.h
View File

@ -133,7 +133,7 @@ public:
void PushGlyphs(wr::DisplayListBuilder& aBuilder, Range<const wr::GlyphInstance> aGlyphs,
gfx::ScaledFont* aFont, const wr::ColorF& aColor,
const StackingContextHelper& aSc,
const wr::LayerRect& aBounds, const wr::LayerRect& aClip,
const wr::LayoutRect& aBounds, const wr::LayoutRect& aClip,
bool aBackfaceVisible,
const wr::GlyphOptions* aGlyphOptions = nullptr);

27
gfx/webrender_bindings/webrender_ffi_generated.h
View File

@ -2,7 +2,7 @@
* 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/. */
/* Generated with cbindgen:0.5.2 */
/* Generated with cbindgen:0.6.0 */
/* DO NOT MODIFY THIS MANUALLY! This file was generated using cbindgen.
* To generate this file:
@ -219,8 +219,8 @@ struct DevicePixel;
struct DocumentHandle;
// Geometry in a layer's local coordinate space (logical pixels).
struct LayerPixel;
// Geometry in a stacking context's local coordinate space (logical pixels).
struct LayoutPixel;
// The renderer is responsible for submitting to the GPU the work prepared by the
// RenderBackend.
@ -386,9 +386,7 @@ struct TypedSize2D {
using DeviceUintSize = TypedSize2D<uint32_t, DevicePixel>;
using LayerSize = TypedSize2D<float, LayerPixel>;
using LayoutSize = LayerSize;
using LayoutSize = TypedSize2D<float, LayoutPixel>;
// Describes the memory layout of a display list.
//
@ -450,9 +448,7 @@ struct TypedRect {
}
};
using LayerRect = TypedRect<float, LayerPixel>;
using LayoutRect = LayerRect;
using LayoutRect = TypedRect<float, LayoutPixel>;
struct BorderRadius {
LayoutSize top_left;
@ -541,9 +537,7 @@ struct TypedVector2D {
}
};
using LayerVector2D = TypedVector2D<float, LayerPixel>;
using LayoutVector2D = LayerVector2D;
using LayoutVector2D = TypedVector2D<float, LayoutPixel>;
struct BorderWidths {
float left;
@ -587,9 +581,7 @@ struct BorderSide {
}
};
using LayerPoint = TypedPoint2D<float, LayerPixel>;
using LayoutPoint = LayerPoint;
using LayoutPoint = TypedPoint2D<float, LayoutPixel>;
struct GradientStop {
float offset;
@ -654,11 +646,6 @@ struct WrAnimationProperty {
}
};
// Geometry in a stacking context's local coordinate space (logical pixels).
//
// For now layout pixels are equivalent to layer pixels, but it may change.
using LayoutPixel = LayerPixel;
// A 3d transform stored as a 4 by 4 matrix in row-major order in memory.
//
// Transforms can be parametrized over the source and destination units, to describe a

4
layout/generic/TextDrawTarget.h
View File

@ -303,7 +303,7 @@ public:
}
private:
wr::LayerRect ClipRect()
wr::LayoutRect ClipRect()
{
return wr::ToRoundedLayoutRect(mClipStack.LastElement());
}
@ -328,7 +328,7 @@ private:
// Computed facts
IntSize mSize;
wr::LayerRect mBoundsRect;
wr::LayoutRect mBoundsRect;
nsTArray<LayoutDeviceRect> mClipStack;
bool mBackfaceVisible;