зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1671813. Avoid a naming conflict between gfx::Glyph and Xrender.h:Glyph. r=aosmond
Non wayland unified builds end up with a different set of files combined which ends up causing the conflict. Remove the 'using namespace mozilla::gfx' to avoid this. Differential Revision: https://phabricator.services.mozilla.com/D94825
This commit is contained in:
Родитель
35b6450a6c
Коммит
cc89bad1d3
|
@ -8,7 +8,6 @@
|
|||
#include "nsLayoutUtils.h"
|
||||
|
||||
using namespace mozilla;
|
||||
using namespace mozilla::gfx;
|
||||
|
||||
static constexpr CSSIntCoord kGtkMinimumScrollbarSize = 12;
|
||||
static constexpr CSSIntCoord kGtkMinimumThinScrollbarSize = 6;
|
||||
|
@ -118,12 +117,12 @@ void nsNativeBasicThemeGTK::PaintScrollbarHorizontal(
|
|||
DrawTarget* aDrawTarget, const Rect& aRect, const ComputedStyle& aStyle,
|
||||
const EventStates& aDocumentState, bool aIsRoot) {
|
||||
sRGBColor trackColor = ComputeScrollbarColor(aStyle, aDocumentState, aIsRoot);
|
||||
aDrawTarget->FillRect(aRect, ColorPattern(ToDeviceColor(trackColor)));
|
||||
aDrawTarget->FillRect(aRect, gfx::ColorPattern(ToDeviceColor(trackColor)));
|
||||
}
|
||||
|
||||
void nsNativeBasicThemeGTK::PaintScrollbarVerticalAndCorner(
|
||||
DrawTarget* aDrawTarget, const Rect& aRect, const ComputedStyle& aStyle,
|
||||
const EventStates& aDocumentState, uint32_t aDpiRatio, bool aIsRoot) {
|
||||
sRGBColor trackColor = ComputeScrollbarColor(aStyle, aDocumentState, aIsRoot);
|
||||
aDrawTarget->FillRect(aRect, ColorPattern(ToDeviceColor(trackColor)));
|
||||
aDrawTarget->FillRect(aRect, gfx::ColorPattern(ToDeviceColor(trackColor)));
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче