wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backing out bug 889085 (dddfd63f1414, f8c14bd80676) due to regression bug 987783. r=roc

Browse Source
This commit is contained in:
Mike Kaply 2014-04-02 10:03:08 -05:00
parent 8b45913574
commit daef6292e9
3 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
layout/base/nsCSSRendering.cpp
View File

@ -1695,12 +1695,6 @@ nsCSSRendering::DetermineBackgroundColor(nsPresContext* aPresContext,
bool& aDrawBackgroundImage,
bool& aDrawBackgroundColor)
{
if (aFrame->IsThemed()) {
aDrawBackgroundColor = false;
aDrawBackgroundImage = false;
return NS_RGBA(0,0,0,0);
}
aDrawBackgroundImage = true;
aDrawBackgroundColor = true;

1
widget/cocoa/nsNativeThemeCocoa.h
View File

@ -71,7 +71,6 @@ protected:
nsIFrame* SeparatorResponsibility(nsIFrame* aBefore, nsIFrame* aAfter);
CGRect SeparatorAdjustedRect(CGRect aRect, nsIFrame* aLeft,
nsIFrame* aCurrent, nsIFrame* aRight);
bool IsWindowSheet(nsIFrame* aFrame);
// HITheme drawing routines
void DrawFrame(CGContextRef context, HIThemeFrameKind inKind,

24
widget/cocoa/nsNativeThemeCocoa.mm
View File

@ -2152,14 +2152,7 @@ nsNativeThemeCocoa::DrawWidgetBackground(nsRenderingContext* aContext,
switch (aWidgetType) {
case NS_THEME_DIALOG: {
CGContextClearRect(cgContext, macRect);
if (IsWindowSheet(aFrame)) {
HIThemeSetFill(kThemeBrushSheetBackgroundTransparent, NULL, cgContext, HITHEME_ORIENTATION);
}
else {
HIThemeSetFill(kThemeBrushDialogBackgroundActive, NULL, cgContext, HITHEME_ORIENTATION);
}
HIThemeSetFill(kThemeBrushDialogBackgroundActive, NULL, cgContext, HITHEME_ORIENTATION);
CGContextFillRect(cgContext, macRect);
}
break;
@ -3429,18 +3422,6 @@ nsNativeThemeCocoa::WidgetAppearanceDependsOnWindowFocus(uint8_t aWidgetType)
}
}
bool
nsNativeThemeCocoa::IsWindowSheet(nsIFrame* aFrame)
{
NSWindow* win = NativeWindowForFrame(aFrame);
id winDelegate = [win delegate];
nsIWidget* widget = [(WindowDelegate *)winDelegate geckoWidget];
if (!widget) {
return false;
}
return (widget->WindowType() == eWindowType_sheet);
}
nsITheme::Transparency
nsNativeThemeCocoa::GetWidgetTransparency(nsIFrame* aFrame, uint8_t aWidgetType)
{
@ -3449,9 +3430,6 @@ nsNativeThemeCocoa::GetWidgetTransparency(nsIFrame* aFrame, uint8_t aWidgetType)
case NS_THEME_TOOLTIP:
return eTransparent;
case NS_THEME_DIALOG:
return IsWindowSheet(aFrame) ? eTransparent : eOpaque;
case NS_THEME_SCROLLBAR_SMALL:
case NS_THEME_SCROLLBAR:
return nsLookAndFeel::UseOverlayScrollbars() ? eTransparent : eOpaque;