mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
157a125630
- Bug 1144778 - Send an HTTP Date request header with telemetry pings. r=dexter (b630ff3123) - Bug 1268581 - Reduce Telemetry initialization delay in tests. r=dexter (08ea2597f4) - Bug 1205898 - Making TelemetryStopwatch.jsm handle keyed histograms. r=gfritzsche (2e1d793bc0) - Bug 1262386 - Move Scheduler shutdown() next to init(). r=dexter (9aa12c0859) - Bug 1162538 - Add test coverage for Telemetry archive probes. r=gfritzsche (f7f9095e82) - Bug 1186955 - Add test coverage. r=gfritzsche (cc76ba4fda) - Bug 1262386 - Trigger Telemetry scheduler tick after waking up from sleep. r=dexter (27b03357bf) - Bug 1178005 - Fix unintended octal literals (00 => 0). r=Mossop (dd738033b1) - Bug 1222054 - Fix broken tests. r=gfritzsche (a6c6fa3445) - Bug 1161515 - Reset UUID generator with fakeGenerateUUID(). r=gfritzsche (460ed17cb5) - Bug 1209912 - Use JSON.parse instead of nsIJSON.decode in Telemetry tests. r=Dexter (7ca55a9b5c) - Bug 1245136 - Discard old-format pending Telemetry files. r=gfritzsche (57f2a19c9d) - Bug 1034138 - d. Test BackgroundHangMonitor permahangs; r=vladan (7313b143bc) - Bug 1016629 - h. Fix wrong sysinfo usage; r=trivial (9823cd5ed0) - Bug 1197612 - In test_TelemetrySendOldPings.js, set the FHR pref to the value the tests assume it has. r=gfritzsche (06a41428b2) - Bug 1136082 - test_TelemetrySendOldPings.js is missing AddonManager initialization. r=froydnj (cfc700dd44) - Bug 1239480 - Make test_TelemetryReportingPolicy.js set the minimum policy version pref for the right channel. r=gfritzsche (e44841aa2a) - Bug 1230213 - test_TelemetryLog yields from a non generator function. r=dexter (34f28fb0b1) - Bug 1226178 - Fix deprecated octal literals warnings in Telemetry tests. r=gfritzsche (88208f0f2e) - Bug 1174111 - |test_sendTimeout| in test_TelemetryControllerShutdown.js must not wait on ping submission. r=gfritzsche (3b010e9743) - Bug 1120379 - Add tests for the deletion ping. r=gfritzsche (61e6fbd8a1) - Bug 1178262 - Add test-coverage for sending persisted deletion pings. r=gfritzsche (657fbbbcc2) - Bug 1174674 - Add test coverage. r=gfritzsche (426212e94c) - Bug 1167456 - Add test coverage. r=gfritzsche (4842d38e2e) - Bug 1198364 - Set FHR upload pref in telemetry/tests/unit/head.js to avoid test failures. r=gfritzsche (024599364e) - Bug 1149284 - Restore Telemetry tests. r=rvitillo, r=sstamm (88d4022e6b) - add esl (c459da1cd3) - Bug 1251785 - Remove remaining references to MOZILLA_XPCOMRT_API from toolkit. r=froydnj (5b5708031d) - Bug 1120379 - Add the documentation for deletion pings. r=gfritzsche (723f44f669) - Bug 1241599 - Add 'core' ping telemetry docs. r=gfritzsche (35fcc54195) - Bug 1241697 - Add docs for 'experiments' field in core ping. r=mfinkle (3c408f1a61) - Bug 1247572 - Add profileDate field to Android core ping docs. r=gfritzsche (79b1c71b53) - Bug 1249288 - Update telemetry docs to include defaultSearch. r=gfritzsche,rnewman (3807061291) - Bug 1257595 - Document that the 'core' pings profileDate field can be missing. r=mcomella (f40392cb2d) - Bug 1246816 - Add docs for profileDate. r=gfritzsche (7248d799aa) - Bug 1263761 - Update defaultSearch in core ping docs for custom search engines. r=gfritzsche (e516ecbab3) - Bug 1247982 - Lock request headers. r=mcmanus (8a5940a109) - Bug 1251332 - add PAC support for reversed ranges; r=bagder (7ac8fd97cb) - Bug 1178337 - Part 1: Supports all referrer policies for element atrributes. r=sicking, r=Gijs, r=mcmanus (85b7421b02) - Bug 1187357 - rename referrer attribute to referrerpolicy in tests. r=hsivonen (da334bf712) - Bug 1178337 - Part 2: Update/add test cases. r=sicking. (acec860fd8) - Bug 1260766 - the comparison of OriginAttributes in nsFrameLoader::Swap* methods should consider the usercontextid attribute of the owning element, r=smaug (82f8895bec) - bits of Bug 1110485 P1 (f8908eb35f) - Bug 1195968 - Check how CanvasFilterChainObserver accesses the CanvasRenderingContext2D. r=mstange (eecc12329b) - Bug 1260960 - Check skiaGL is enabled before calling skiaGLTex(), r=snorp (82c069fcc9) - align test stuff (c0ccc11ed9) - Bug 1245256 - GMP Plugins now installed in flat manner to accomodate widevine. r=spohl (ae0eb69979) - Bug 1245649: Turn on use-isnan, no-unexpected-multiline (0633b3470f) - Bug 1079665 - [e10s] Findbar focusContent doesn't work when a link was found. r=enndeakin (b349e62d5a) - Bug 1174291 - Fix ctrl-return for e10s findbar. r=evilpie (6f0bf0b149) - Bug 1174289 - Remove fake focus-ring after e10s findbar is closed. r=evilpie (302ffe7559) - Bug 1079665 - follow up, remove accidental line included from different patch. r=me (0904fe927c) - Bug 1260208 - part 1 - use C I/O facilities in TestWebGLElementArrayCache instead of C++ ones; r=BenWa The libc++ included with the Android NDK does not seem to work correctly with std::cerr; writing to it (or to std::cout, as confirmed by tests) causes the process to hang indefinitely, causing test failures. Using fprintf and stderr, however, seems to work correctly. (4279c2d09d) - Bug 1260208 - part 5 - add libc++ license to about:license when using it on Android; r=gerv,nalexander (4bcf23794a) - Bug 1260208 - part 0 - correctly compare EHTable when sorting; r=froydnj operator< for EHTable compares the LHS start PC with the RHS *end* PC. Because the ranges are non-overlapping, this works fine for two distinct EHTables. However, the comparison doesn't work if LHS and RHS refer to the same EHTable; in that case operator< returns true, even though it should return false because the two operands are identical. (dc2af36cec) - Bug 1254908 - ./mach bootstrap doesn't work on CentOS/Fedora when it attempts to upgrade Mercurial. r=gps (d288b314ec) - Bug 1239413. Clarify comment about the context flags. (c2b01ef6d1) - Bug 1146875 - Fix the leak-gauge.html broken and add a encoding declaration. r=dbaron (8df2510774) - Bug 1132499 - part 1 - convert nsTextEditorState::mValue to use Maybe instead of heap allocation; r=ehsan (2644faebbb) - Bug 1132499 - part 2 - convert nsTextEditorState::mValue to be an nsString; r=ehsan (6e0df4d1dc) - Bug 409885 - Use SetHostPort in nsHTMLDocument::SetDomain. r=bz (2d289a79c5) - Bug 1269475 - Fix uninitialized variable warning. r=jdm (881fa29803) - Bug 1263935 - Expose native version of mapURIToAddonId via amIAddonPathService. r=mossop (04da9fe703) - missing bit of Bug 1255040 Add webidl for install/uninstall (63b5489b3d) - Bug 1234974 - Handle null GetOwner() in |BluetoothAdapter::IsBluetoothCertifiedApp|, r=shuang (e4dde47d7f) - Bug 1241117 - Fix mAppUuid access before assign in BluetoothGatt::Connect. r=joliu (3920535f2a) - Bug 1238424 - Fix a missing header in Bluetooth module. r=brsun (438fd74375) - Bug 1267958: Only complain for negative size, not merely zero. r=jrmuizel (194bd2a754) - Bug 1320621 - Make sure --enable-system-hunspell picks up system headers. r=glandium (125c4ea215) - Bug 1266430: Support offsets in DrawTargetD2D1::CopySurface when using PartialUploading. r=jrmuizel (de8630b117) - Bug 1267363. Disable hinting on osx fonts only if we have expclity grayscale AA. r=mstange (c4c32fd7cc) - Bug 1134549 - Switch FlattenBezier from floats to doubles. r=bas (5753ab16a3) - Bug 1240437 part 2: Follow-up to fix implicit constrcutor static analysis failure. r=me (525d9d9a9f) - Bug 1256678 - Backout diagnostic patch rev 39c895b67af2 - r=me (f63698de77) - Bug 1256678 - Account for truncated font names in ScaledFontWin::GetFontFileData() - r=jfkthame (a6930e0a33) - Bug 1256678 - Re-add nightly-only crash if ScaledFontWin::GetFontFileData fails to find a matching TrueType collection font - r=jfkthame (8bec2d43a2) - Bug 1260350 - GFX: 2D: Use ConvolveHorizontally_LS3. r=jrmuizel (9d2f372593) - Bug 1260112 - GFX: 2D: Fix unaligned access in ConvolveVertically/Horizontally_LS3. r=huangwenjun06 (43ba8f7b05) - Bug 1260885 - Make SurfaceFormat::R5G6B5_UINT16 properly round-trip through SourceSurfaceCairo. r=lsalzman (bc8f0c0876) - Bug 1262415 - make Accessible to keep weak pointers to parent and children, r=yzen (c0b987fe10) - Bug 1267271 - skip empty surfaces in DrawTargetSkia::DrawSurfaceWithShadow. r=mchang (fd488c918a) - Bug 1249600. Lookup font and font family from font face when requesting SkTypeface. r=bas (0281313c33) - Bug 1268096. Sync the D3D11 rasterizer state if pointDrawMode or multisample changes. (25b2af8b26) - Bug 1203132 - Add an SVG for the B2G flow of touch events. r=botond (2ce3b0ddc4) - Bug 1180322. Add a document describing the history of layers (b3351dbba3) - Bug 1235223. Update history document. (212d356bd0) - Bug 1235223 - Fix typos in layers history document. (f19a5802d8) - Bug 1235223 - Fix another typo in the layers history document. (9663fe5447) - Bug 1265112 - Add support for NV_texture_barrier to GLContext. r=jrmuizel (f1f5fb1a3a) - Bug 1240730 - Initialize all GLLibraryEGL symbols in the ctor. r=mattwoodrow (dae8955458) - Bug 1240730 - Initialize all GLXLibrary members in the ctor. r=mattwoodrow (8218ed6fd9) - bug 1250485 - make the ctor for GLXLibrary constexpr r=jrmuizel (a571491f0a) - mitor spacing (0083550ab2) - Bug 1256492 - Cast to proper width to avoid C4312 on VS2015; r=jrmuizel (1bb2ed20d3) - Bug 1266878 - Fix off-by-one error in ParamTraits<StereoMode> - r=nical (f467d496b8) - Bug 1258758 - rename GetEffectiveClipRect to GetLocalClipRect. r=kats (897798948f) - Bug 1249936 - add a LayerComposite::GetShadowTransform method & simplify Layer::GetLocalTransform. r=botond (fe492a1327) - Bug 1269032 - Add support for user multipliers to pan gesture inputs. r=mstange (ea7698dca2) - Bug 1265510 - Add some scroll-snapping logging to APZC. r=botond (6f2369163a) - Bug 1268523 - Avoid leaking tasks when they are posted to a destroyed APZC instance. r=botond (70e1e63b7b) - Bug 1265510 - Ensure that new input blocks still allow APZCs with interrupted animations to scroll-snap. r=botond (01341b554b) - Bug 1269068 - Zero out the axis velocity once the wheel scroll animation is terminating. r=botond (9a9f384485) - Bug 1246056 - Ensure that the MockContentController's timestamp is always >= GetStartupTime(). r=botond (4fe53e1f24) - Bug 1256341 - Add a gtest to catch scenarios where a tap timeout is interrupted by a non-touch block. r=botond (21a15f5a5a) - Bug 1266833 - When the scroll position is clamped during a frame reconstruction, send a scroll offset update to APZ. r=tnikkel (c0acd70a3d) - Bug 1268517 - Remove unused function. r=botond (534e4d9bae) - Bug 1213095 - Fix APZEventState build with logging enabled. r=botond (ac7c1e9401) - Bug 1250954 - Correct the SharedSurfaceTextureClient when forwarder changed. r=jgilbert (0a389bc0fa) - Bug 1265873 - Use gfxSharedReadLock in TextureClientPool r=nical (e3ed936a8a) - Bug 1265468 - Update the compositor pointer on all TextureSources in the list when recycling in ImageHost. r=nical (78f29244bb) - Bug 1252237 - Remove the TextureHost shmem mapping failed assert. r=milan (d0b7230dff) - Bug 1265112 - When rendering blend modes with CompositorOGL, use NV_texture_barrier (if available) to sample directly from the framebuffer. r=jrmuizel (6f3ae237a5) - Bug 1268878 - Include various of gfxFontEntry's sub-objects in memory reporting. r=njn (b960415fa8) - Bug 1268951 - Reallocate sanitized user font data into an appropriately-sized block, to reduce ongoing RAM footprint. r=jrmuizel (a26e9dd632) - Bug 1123416 - Part 1: Make topsrcdir a valid Gradle project root. r=sebastian (77b0b35fc1) - Bug 1260672: Remove 'nsAutoPtr.h' and clean up includes of Gonk diskspace watcher, r=gsvelto (99c4c35e3d) - Bug 1167535 - Fix fanotify 4g size limit. r=fabrice (c62015e454) - Bug 1167817 - Switch back to printf_stderr in GonkDiskSpaceWatcher.cpp r=dhylands (110445f628) - Bug 1260672: Use |UniquePtr| for Gonk alarms, r=gsvelto (03678b9015) - Bug 1260672: Use |UniquePtr| for Gonk sensors, r=gsvelto (545ec3fc70) - Bug 1263845. When a parent changes from auto height to non-auto height or vice versa, a percentage height non-block child needs to realize it's doing a vertical resize. r=dbaron (05db492bc8) - Bug 1268009 - If APZ is force-disabled, disable paint skipping even for apz-originated scrolls. r=kats (c02f8755cd) - Bug 1267555 part 1 - [css-grid] Make grid-aligned abs.pos. descendants that span from 'auto' to the first/last line stretch to the outer edge of the first/last track respectively. r=dholbert (88f6261043) - Bug 1267555 part 2 - [css-grid] Adjust reftests for abs.pos. "auto/first-line" and "last-line/auto" change. (43d03ab15b)
518 lines
14 KiB
C++
518 lines
14 KiB
C++
/* -*- Mode: C++; tab-width: 20; 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/. */
|
|
|
|
#include "PathD2D.h"
|
|
#include "HelpersD2D.h"
|
|
#include <math.h>
|
|
#include "DrawTargetD2D1.h"
|
|
#include "Logging.h"
|
|
|
|
namespace mozilla {
|
|
namespace gfx {
|
|
|
|
// This class exists as a wrapper for ID2D1SimplifiedGeometry sink, it allows
|
|
// a geometry to be duplicated into a geometry sink, while removing the final
|
|
// figure end and thus allowing a figure that was implicitly closed to be
|
|
// continued.
|
|
class OpeningGeometrySink : public ID2D1SimplifiedGeometrySink
|
|
{
|
|
public:
|
|
OpeningGeometrySink(ID2D1SimplifiedGeometrySink *aSink)
|
|
: mSink(aSink)
|
|
, mNeedsFigureEnded(false)
|
|
{
|
|
}
|
|
|
|
HRESULT STDMETHODCALLTYPE QueryInterface(const IID &aIID, void **aPtr)
|
|
{
|
|
if (!aPtr) {
|
|
return E_POINTER;
|
|
}
|
|
|
|
if (aIID == IID_IUnknown) {
|
|
*aPtr = static_cast<IUnknown*>(this);
|
|
return S_OK;
|
|
} else if (aIID == IID_ID2D1SimplifiedGeometrySink) {
|
|
*aPtr = static_cast<ID2D1SimplifiedGeometrySink*>(this);
|
|
return S_OK;
|
|
}
|
|
|
|
return E_NOINTERFACE;
|
|
}
|
|
|
|
ULONG STDMETHODCALLTYPE AddRef()
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
ULONG STDMETHODCALLTYPE Release()
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
// We ignore SetFillMode, the copier will decide.
|
|
STDMETHOD_(void, SetFillMode)(D2D1_FILL_MODE aMode)
|
|
{ EnsureFigureEnded(); return; }
|
|
STDMETHOD_(void, BeginFigure)(D2D1_POINT_2F aPoint, D2D1_FIGURE_BEGIN aBegin)
|
|
{ EnsureFigureEnded(); return mSink->BeginFigure(aPoint, aBegin); }
|
|
STDMETHOD_(void, AddLines)(const D2D1_POINT_2F *aLines, UINT aCount)
|
|
{ EnsureFigureEnded(); return mSink->AddLines(aLines, aCount); }
|
|
STDMETHOD_(void, AddBeziers)(const D2D1_BEZIER_SEGMENT *aSegments, UINT aCount)
|
|
{ EnsureFigureEnded(); return mSink->AddBeziers(aSegments, aCount); }
|
|
STDMETHOD(Close)()
|
|
{ /* Should never be called! */ return S_OK; }
|
|
STDMETHOD_(void, SetSegmentFlags)(D2D1_PATH_SEGMENT aFlags)
|
|
{ return mSink->SetSegmentFlags(aFlags); }
|
|
|
|
// This function is special - it's the reason this class exists.
|
|
// It needs to intercept the very last endfigure. So that a user can
|
|
// continue writing to this sink as if they never stopped.
|
|
STDMETHOD_(void, EndFigure)(D2D1_FIGURE_END aEnd)
|
|
{
|
|
if (aEnd == D2D1_FIGURE_END_CLOSED) {
|
|
return mSink->EndFigure(aEnd);
|
|
} else {
|
|
mNeedsFigureEnded = true;
|
|
}
|
|
}
|
|
private:
|
|
void EnsureFigureEnded()
|
|
{
|
|
if (mNeedsFigureEnded) {
|
|
mSink->EndFigure(D2D1_FIGURE_END_OPEN);
|
|
mNeedsFigureEnded = false;
|
|
}
|
|
}
|
|
|
|
ID2D1SimplifiedGeometrySink *mSink;
|
|
bool mNeedsFigureEnded;
|
|
};
|
|
|
|
class MOZ_STACK_CLASS AutoRestoreFP
|
|
{
|
|
public:
|
|
AutoRestoreFP()
|
|
{
|
|
// save the current floating point control word
|
|
_controlfp_s(&savedFPSetting, 0, 0);
|
|
UINT unused;
|
|
// set the floating point control word to its default value
|
|
_controlfp_s(&unused, _CW_DEFAULT, MCW_PC);
|
|
}
|
|
~AutoRestoreFP()
|
|
{
|
|
UINT unused;
|
|
// restore the saved floating point control word
|
|
_controlfp_s(&unused, savedFPSetting, MCW_PC);
|
|
}
|
|
private:
|
|
UINT savedFPSetting;
|
|
};
|
|
|
|
// Note that overrides of ID2D1SimplifiedGeometrySink methods in this class may
|
|
// get called from D2D with nonstandard floating point settings (see comments in
|
|
// bug 1134549) - use AutoRestoreFP to reset the floating point control word to
|
|
// what we expect
|
|
class StreamingGeometrySink : public ID2D1SimplifiedGeometrySink
|
|
{
|
|
public:
|
|
StreamingGeometrySink(PathSink *aSink)
|
|
: mSink(aSink)
|
|
{
|
|
}
|
|
|
|
HRESULT STDMETHODCALLTYPE QueryInterface(const IID &aIID, void **aPtr)
|
|
{
|
|
if (!aPtr) {
|
|
return E_POINTER;
|
|
}
|
|
|
|
if (aIID == IID_IUnknown) {
|
|
*aPtr = static_cast<IUnknown*>(this);
|
|
return S_OK;
|
|
} else if (aIID == IID_ID2D1SimplifiedGeometrySink) {
|
|
*aPtr = static_cast<ID2D1SimplifiedGeometrySink*>(this);
|
|
return S_OK;
|
|
}
|
|
|
|
return E_NOINTERFACE;
|
|
}
|
|
|
|
ULONG STDMETHODCALLTYPE AddRef()
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
ULONG STDMETHODCALLTYPE Release()
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
// We ignore SetFillMode, this depends on the destination sink.
|
|
STDMETHOD_(void, SetFillMode)(D2D1_FILL_MODE aMode)
|
|
{ return; }
|
|
STDMETHOD_(void, BeginFigure)(D2D1_POINT_2F aPoint, D2D1_FIGURE_BEGIN aBegin)
|
|
{
|
|
AutoRestoreFP resetFloatingPoint;
|
|
mSink->MoveTo(ToPoint(aPoint));
|
|
}
|
|
STDMETHOD_(void, AddLines)(const D2D1_POINT_2F *aLines, UINT aCount)
|
|
{
|
|
AutoRestoreFP resetFloatingPoint;
|
|
for (UINT i = 0; i < aCount; i++) { mSink->LineTo(ToPoint(aLines[i])); }
|
|
}
|
|
STDMETHOD_(void, AddBeziers)(const D2D1_BEZIER_SEGMENT *aSegments, UINT aCount)
|
|
{
|
|
AutoRestoreFP resetFloatingPoint;
|
|
for (UINT i = 0; i < aCount; i++) {
|
|
mSink->BezierTo(ToPoint(aSegments[i].point1), ToPoint(aSegments[i].point2), ToPoint(aSegments[i].point3));
|
|
}
|
|
}
|
|
STDMETHOD(Close)()
|
|
{ /* Should never be called! */ return S_OK; }
|
|
STDMETHOD_(void, SetSegmentFlags)(D2D1_PATH_SEGMENT aFlags)
|
|
{ /* Should never be called! */ }
|
|
|
|
STDMETHOD_(void, EndFigure)(D2D1_FIGURE_END aEnd)
|
|
{
|
|
AutoRestoreFP resetFloatingPoint;
|
|
if (aEnd == D2D1_FIGURE_END_CLOSED) {
|
|
return mSink->Close();
|
|
}
|
|
}
|
|
private:
|
|
|
|
PathSink *mSink;
|
|
};
|
|
|
|
PathBuilderD2D::~PathBuilderD2D()
|
|
{
|
|
}
|
|
|
|
void
|
|
PathBuilderD2D::MoveTo(const Point &aPoint)
|
|
{
|
|
if (mFigureActive) {
|
|
mSink->EndFigure(D2D1_FIGURE_END_OPEN);
|
|
mFigureActive = false;
|
|
}
|
|
EnsureActive(aPoint);
|
|
mCurrentPoint = aPoint;
|
|
}
|
|
|
|
void
|
|
PathBuilderD2D::LineTo(const Point &aPoint)
|
|
{
|
|
EnsureActive(aPoint);
|
|
mSink->AddLine(D2DPoint(aPoint));
|
|
|
|
mCurrentPoint = aPoint;
|
|
}
|
|
|
|
void
|
|
PathBuilderD2D::BezierTo(const Point &aCP1,
|
|
const Point &aCP2,
|
|
const Point &aCP3)
|
|
{
|
|
EnsureActive(aCP1);
|
|
mSink->AddBezier(D2D1::BezierSegment(D2DPoint(aCP1),
|
|
D2DPoint(aCP2),
|
|
D2DPoint(aCP3)));
|
|
|
|
mCurrentPoint = aCP3;
|
|
}
|
|
|
|
void
|
|
PathBuilderD2D::QuadraticBezierTo(const Point &aCP1,
|
|
const Point &aCP2)
|
|
{
|
|
EnsureActive(aCP1);
|
|
mSink->AddQuadraticBezier(D2D1::QuadraticBezierSegment(D2DPoint(aCP1),
|
|
D2DPoint(aCP2)));
|
|
|
|
mCurrentPoint = aCP2;
|
|
}
|
|
|
|
void
|
|
PathBuilderD2D::Close()
|
|
{
|
|
if (mFigureActive) {
|
|
mSink->EndFigure(D2D1_FIGURE_END_CLOSED);
|
|
|
|
mFigureActive = false;
|
|
|
|
EnsureActive(mBeginPoint);
|
|
}
|
|
}
|
|
|
|
void
|
|
PathBuilderD2D::Arc(const Point &aOrigin, Float aRadius, Float aStartAngle,
|
|
Float aEndAngle, bool aAntiClockwise)
|
|
{
|
|
if (aAntiClockwise && aStartAngle < aEndAngle) {
|
|
// D2D does things a little differently, and draws the arc by specifying an
|
|
// beginning and an end point. This means the circle will be the wrong way
|
|
// around if the start angle is smaller than the end angle. It might seem
|
|
// tempting to invert aAntiClockwise but that would change the sweeping
|
|
// direction of the arc so instead we exchange start/begin.
|
|
Float oldStart = aStartAngle;
|
|
aStartAngle = aEndAngle;
|
|
aEndAngle = oldStart;
|
|
}
|
|
|
|
// XXX - Workaround for now, D2D does not appear to do the desired thing when
|
|
// the angle sweeps a complete circle.
|
|
bool fullCircle = false;
|
|
if (aEndAngle - aStartAngle >= 2 * M_PI) {
|
|
fullCircle = true;
|
|
aEndAngle = Float(aStartAngle + M_PI * 1.9999);
|
|
} else if (aStartAngle - aEndAngle >= 2 * M_PI) {
|
|
fullCircle = true;
|
|
aStartAngle = Float(aEndAngle + M_PI * 1.9999);
|
|
}
|
|
|
|
Point startPoint;
|
|
startPoint.x = aOrigin.x + aRadius * cos(aStartAngle);
|
|
startPoint.y = aOrigin.y + aRadius * sin(aStartAngle);
|
|
|
|
if (!mFigureActive) {
|
|
EnsureActive(startPoint);
|
|
} else {
|
|
mSink->AddLine(D2DPoint(startPoint));
|
|
}
|
|
|
|
Point endPoint;
|
|
endPoint.x = aOrigin.x + aRadius * cosf(aEndAngle);
|
|
endPoint.y = aOrigin.y + aRadius * sinf(aEndAngle);
|
|
|
|
D2D1_ARC_SIZE arcSize = D2D1_ARC_SIZE_SMALL;
|
|
D2D1_SWEEP_DIRECTION direction =
|
|
aAntiClockwise ? D2D1_SWEEP_DIRECTION_COUNTER_CLOCKWISE :
|
|
D2D1_SWEEP_DIRECTION_CLOCKWISE;
|
|
|
|
// if startPoint and endPoint of our circle are too close there are D2D issues
|
|
// with drawing the circle as a single arc
|
|
const Float kEpsilon = 1e-5f;
|
|
if (!fullCircle ||
|
|
(std::abs(startPoint.x - endPoint.x) +
|
|
std::abs(startPoint.y - endPoint.y) > kEpsilon)) {
|
|
|
|
if (aAntiClockwise) {
|
|
if (aStartAngle - aEndAngle > M_PI) {
|
|
arcSize = D2D1_ARC_SIZE_LARGE;
|
|
}
|
|
} else {
|
|
if (aEndAngle - aStartAngle > M_PI) {
|
|
arcSize = D2D1_ARC_SIZE_LARGE;
|
|
}
|
|
}
|
|
|
|
mSink->AddArc(D2D1::ArcSegment(D2DPoint(endPoint),
|
|
D2D1::SizeF(aRadius, aRadius),
|
|
0.0f,
|
|
direction,
|
|
arcSize));
|
|
}
|
|
else {
|
|
// our first workaround attempt didn't work, so instead draw the circle as
|
|
// two half-circles
|
|
Float midAngle = aEndAngle > aStartAngle ?
|
|
Float(aStartAngle + M_PI) : Float(aEndAngle + M_PI);
|
|
Point midPoint;
|
|
midPoint.x = aOrigin.x + aRadius * cosf(midAngle);
|
|
midPoint.y = aOrigin.y + aRadius * sinf(midAngle);
|
|
|
|
mSink->AddArc(D2D1::ArcSegment(D2DPoint(midPoint),
|
|
D2D1::SizeF(aRadius, aRadius),
|
|
0.0f,
|
|
direction,
|
|
arcSize));
|
|
|
|
// if the adjusted endPoint computed above is used here and endPoint !=
|
|
// startPoint then this half of the circle won't render...
|
|
mSink->AddArc(D2D1::ArcSegment(D2DPoint(startPoint),
|
|
D2D1::SizeF(aRadius, aRadius),
|
|
0.0f,
|
|
direction,
|
|
arcSize));
|
|
}
|
|
|
|
mCurrentPoint = endPoint;
|
|
}
|
|
|
|
Point
|
|
PathBuilderD2D::CurrentPoint() const
|
|
{
|
|
return mCurrentPoint;
|
|
}
|
|
|
|
void
|
|
PathBuilderD2D::EnsureActive(const Point &aPoint)
|
|
{
|
|
if (!mFigureActive) {
|
|
mSink->BeginFigure(D2DPoint(aPoint), D2D1_FIGURE_BEGIN_FILLED);
|
|
mBeginPoint = aPoint;
|
|
mFigureActive = true;
|
|
}
|
|
}
|
|
|
|
already_AddRefed<Path>
|
|
PathBuilderD2D::Finish()
|
|
{
|
|
if (mFigureActive) {
|
|
mSink->EndFigure(D2D1_FIGURE_END_OPEN);
|
|
}
|
|
|
|
HRESULT hr = mSink->Close();
|
|
if (FAILED(hr)) {
|
|
gfxCriticalNote << "Failed to close PathSink. Code: " << hexa(hr);
|
|
return nullptr;
|
|
}
|
|
|
|
return MakeAndAddRef<PathD2D>(mGeometry, mFigureActive, mCurrentPoint, mFillRule, mBackendType);
|
|
}
|
|
|
|
already_AddRefed<PathBuilder>
|
|
PathD2D::CopyToBuilder(FillRule aFillRule) const
|
|
{
|
|
return TransformedCopyToBuilder(Matrix(), aFillRule);
|
|
}
|
|
|
|
already_AddRefed<PathBuilder>
|
|
PathD2D::TransformedCopyToBuilder(const Matrix &aTransform, FillRule aFillRule) const
|
|
{
|
|
RefPtr<ID2D1PathGeometry> path;
|
|
HRESULT hr = DrawTargetD2D1::factory()->CreatePathGeometry(getter_AddRefs(path));
|
|
|
|
if (FAILED(hr)) {
|
|
gfxWarning() << "Failed to create PathGeometry. Code: " << hexa(hr);
|
|
return nullptr;
|
|
}
|
|
|
|
RefPtr<ID2D1GeometrySink> sink;
|
|
hr = path->Open(getter_AddRefs(sink));
|
|
if (FAILED(hr)) {
|
|
gfxWarning() << "Failed to open Geometry for writing. Code: " << hexa(hr);
|
|
return nullptr;
|
|
}
|
|
|
|
if (aFillRule == FillRule::FILL_WINDING) {
|
|
sink->SetFillMode(D2D1_FILL_MODE_WINDING);
|
|
}
|
|
|
|
if (mEndedActive) {
|
|
OpeningGeometrySink wrapSink(sink);
|
|
mGeometry->Simplify(D2D1_GEOMETRY_SIMPLIFICATION_OPTION_CUBICS_AND_LINES,
|
|
D2DMatrix(aTransform),
|
|
&wrapSink);
|
|
} else {
|
|
mGeometry->Simplify(D2D1_GEOMETRY_SIMPLIFICATION_OPTION_CUBICS_AND_LINES,
|
|
D2DMatrix(aTransform),
|
|
sink);
|
|
}
|
|
|
|
RefPtr<PathBuilderD2D> pathBuilder = new PathBuilderD2D(sink, path, aFillRule, mBackendType);
|
|
|
|
pathBuilder->mCurrentPoint = aTransform * mEndPoint;
|
|
|
|
if (mEndedActive) {
|
|
pathBuilder->mFigureActive = true;
|
|
}
|
|
|
|
return pathBuilder.forget();
|
|
}
|
|
|
|
void
|
|
PathD2D::StreamToSink(PathSink *aSink) const
|
|
{
|
|
HRESULT hr;
|
|
|
|
StreamingGeometrySink sink(aSink);
|
|
|
|
hr = mGeometry->Simplify(D2D1_GEOMETRY_SIMPLIFICATION_OPTION_CUBICS_AND_LINES,
|
|
D2D1::IdentityMatrix(), &sink);
|
|
|
|
if (FAILED(hr)) {
|
|
gfxWarning() << "Failed to stream D2D path to sink. Code: " << hexa(hr);
|
|
return;
|
|
}
|
|
}
|
|
|
|
bool
|
|
PathD2D::ContainsPoint(const Point &aPoint, const Matrix &aTransform) const
|
|
{
|
|
BOOL result;
|
|
|
|
HRESULT hr = mGeometry->FillContainsPoint(D2DPoint(aPoint), D2DMatrix(aTransform), 0.001f, &result);
|
|
|
|
if (FAILED(hr)) {
|
|
// Log
|
|
return false;
|
|
}
|
|
|
|
return !!result;
|
|
}
|
|
|
|
bool
|
|
PathD2D::StrokeContainsPoint(const StrokeOptions &aStrokeOptions,
|
|
const Point &aPoint,
|
|
const Matrix &aTransform) const
|
|
{
|
|
BOOL result;
|
|
|
|
RefPtr<ID2D1StrokeStyle> strokeStyle = CreateStrokeStyleForOptions(aStrokeOptions);
|
|
HRESULT hr = mGeometry->StrokeContainsPoint(D2DPoint(aPoint),
|
|
aStrokeOptions.mLineWidth,
|
|
strokeStyle,
|
|
D2DMatrix(aTransform),
|
|
&result);
|
|
|
|
if (FAILED(hr)) {
|
|
// Log
|
|
return false;
|
|
}
|
|
|
|
return !!result;
|
|
}
|
|
|
|
Rect
|
|
PathD2D::GetBounds(const Matrix &aTransform) const
|
|
{
|
|
D2D1_RECT_F d2dBounds;
|
|
|
|
HRESULT hr = mGeometry->GetBounds(D2DMatrix(aTransform), &d2dBounds);
|
|
|
|
Rect bounds = ToRect(d2dBounds);
|
|
if (FAILED(hr) || !bounds.IsFinite()) {
|
|
gfxWarning() << "Failed to get stroked bounds for path. Code: " << hexa(hr);
|
|
return Rect();
|
|
}
|
|
|
|
return bounds;
|
|
}
|
|
|
|
Rect
|
|
PathD2D::GetStrokedBounds(const StrokeOptions &aStrokeOptions,
|
|
const Matrix &aTransform) const
|
|
{
|
|
D2D1_RECT_F d2dBounds;
|
|
|
|
RefPtr<ID2D1StrokeStyle> strokeStyle = CreateStrokeStyleForOptions(aStrokeOptions);
|
|
HRESULT hr =
|
|
mGeometry->GetWidenedBounds(aStrokeOptions.mLineWidth, strokeStyle,
|
|
D2DMatrix(aTransform), &d2dBounds);
|
|
|
|
Rect bounds = ToRect(d2dBounds);
|
|
if (FAILED(hr) || !bounds.IsFinite()) {
|
|
gfxWarning() << "Failed to get stroked bounds for path. Code: " << hexa(hr);
|
|
return Rect();
|
|
}
|
|
|
|
return bounds;
|
|
}
|
|
|
|
}
|
|
}
|