author | Jacek Caban <jacek@codeweavers.com> |
Sat, 29 Jun 2013 12:13:42 +0200 (2013-06-29) | |
changeset 136901 | 7b86302ab2b3bb60f436f0c4209e1565a8ed1b80 |
parent 136900 | fda0046aa3760057c66f11afb704ba12b50eab2e |
child 136902 | 5e226d928613a0f72595595ff1d57ca757a46ade |
push id | 24899 |
push user | philringnalda@gmail.com |
push date | Sun, 30 Jun 2013 00:29:19 +0000 (2013-06-30) |
treeherder | mozilla-central@614e1793e958 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | jmuizelaar |
bugs | 887821 |
milestone | 25.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
gfx/2d/RadialGradientEffectD2D1.cpp | file | annotate | diff | comparison | revisions | |
gfx/2d/RadialGradientEffectD2D1.h | file | annotate | diff | comparison | revisions |
--- a/gfx/2d/RadialGradientEffectD2D1.cpp +++ b/gfx/2d/RadialGradientEffectD2D1.cpp @@ -259,22 +259,23 @@ RadialGradientEffectD2D1::SetDrawInfo(ID mDrawInfo = pDrawInfo; return S_OK; } HRESULT RadialGradientEffectD2D1::Register(ID2D1Factory1 *aFactory) { D2D1_PROPERTY_BINDING bindings[] = { - D2D1_VALUE_TYPE_BINDING(L"StopCollection", &SetStopCollection, &GetStopCollection), - D2D1_VALUE_TYPE_BINDING(L"Center1", &SetCenter1, &GetCenter1), - D2D1_VALUE_TYPE_BINDING(L"Center2", &SetCenter2, &GetCenter2), - D2D1_VALUE_TYPE_BINDING(L"Radius1", &SetRadius1, &GetRadius1), - D2D1_VALUE_TYPE_BINDING(L"Radius2", &SetRadius2, &GetRadius2), - D2D1_VALUE_TYPE_BINDING(L"Transform", &SetTransform, &GetTransform) + D2D1_VALUE_TYPE_BINDING(L"StopCollection", &RadialGradientEffectD2D1::SetStopCollection, + &RadialGradientEffectD2D1::GetStopCollection), + D2D1_VALUE_TYPE_BINDING(L"Center1", &RadialGradientEffectD2D1::SetCenter1, &RadialGradientEffectD2D1::GetCenter1), + D2D1_VALUE_TYPE_BINDING(L"Center2", &RadialGradientEffectD2D1::SetCenter2, &RadialGradientEffectD2D1::GetCenter2), + D2D1_VALUE_TYPE_BINDING(L"Radius1", &RadialGradientEffectD2D1::SetRadius1, &RadialGradientEffectD2D1::GetRadius1), + D2D1_VALUE_TYPE_BINDING(L"Radius2", &RadialGradientEffectD2D1::SetRadius2, &RadialGradientEffectD2D1::GetRadius2), + D2D1_VALUE_TYPE_BINDING(L"Transform", &RadialGradientEffectD2D1::SetTransform, &RadialGradientEffectD2D1::GetTransform) }; HRESULT hr = aFactory->RegisterEffectFromString(CLSID_RadialGradientEffect, kXmlDescription, bindings, ARRAYSIZE(bindings), CreateEffect); if (FAILED(hr)) { gfxWarning() << "Failed to register radial gradient effect."; } return hr; }
--- a/gfx/2d/RadialGradientEffectD2D1.h +++ b/gfx/2d/RadialGradientEffectD2D1.h @@ -6,16 +6,17 @@ #ifndef MOZILLA_GFX_RADIALGRADIENTEFFECTD2D1_H_ #define MOZILLA_GFX_RADIALGRADIENTEFFECTD2D1_H_ #include <d2d1_1.h> #include <d2d1effectauthor.h> #include <d2d1effecthelpers.h> #include "2D.h" +#include "mozilla/Attributes.h" // {97143DC6-CBC4-4DD4-A8BA-13342B0BA46D} DEFINE_GUID(CLSID_RadialGradientEffect, 0x97143dc6, 0xcbc4, 0x4dd4, 0xa8, 0xba, 0x13, 0x34, 0x2b, 0xb, 0xa4, 0x6d); // Macro to keep our class nice and clean. #define SIMPLE_PROP(type, name) \ public: \ @@ -32,18 +33,18 @@ enum { RADIAL_PROP_STOP_COLLECTION = 0, RADIAL_PROP_CENTER_1, RADIAL_PROP_CENTER_2, RADIAL_PROP_RADIUS_1, RADIAL_PROP_RADIUS_2, RADIAL_PROP_TRANSFORM }; -class RadialGradientEffectD2D1 : public ID2D1EffectImpl - , public ID2D1DrawTransform +class RadialGradientEffectD2D1 MOZ_FINAL : public ID2D1EffectImpl + , public ID2D1DrawTransform { public: // ID2D1EffectImpl IFACEMETHODIMP Initialize(ID2D1EffectContext* pContextInternal, ID2D1TransformGraph* pTransformGraph); IFACEMETHODIMP PrepareForRender(D2D1_CHANGE_TYPE changeType); IFACEMETHODIMP SetGraph(ID2D1TransformGraph* pGraph); // IUnknown