Merge branch 'master' into roller/chromium/master
This commit is contained in:
parent
8f4e362d8f
commit
57a8781c01
137 changed files with 876 additions and 4289 deletions
|
@ -996,8 +996,10 @@ void NativeWindowMac::SetBackgroundColor(SkColor color) {
|
|||
}
|
||||
|
||||
SkColor NativeWindowMac::GetBackgroundColor() {
|
||||
return skia::CGColorRefToSkColor(
|
||||
[[[window_ contentView] layer] backgroundColor]);
|
||||
CGColorRef color = [[[window_ contentView] layer] backgroundColor];
|
||||
if (!color)
|
||||
return SK_ColorTRANSPARENT;
|
||||
return skia::CGColorRefToSkColor(color);
|
||||
}
|
||||
|
||||
void NativeWindowMac::SetHasShadow(bool has_shadow) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue