diff --git a/devtools/shared/css/generated/properties-db.js b/devtools/shared/css/generated/properties-db.js index cb1f35446b68..d3ec0a69f852 100644 --- a/devtools/shared/css/generated/properties-db.js +++ b/devtools/shared/css/generated/properties-db.js @@ -222,9 +222,6 @@ exports.CSS_PROPERTIES = { "-moz-window-button-maximize", "-moz-window-button-minimize", "-moz-window-button-restore", - "-moz-window-frame-bottom", - "-moz-window-frame-left", - "-moz-window-frame-right", "-moz-window-titlebar", "-moz-window-titlebar-maximized", "auto", @@ -1496,9 +1493,6 @@ exports.CSS_PROPERTIES = { "-moz-window-button-maximize", "-moz-window-button-minimize", "-moz-window-button-restore", - "-moz-window-frame-bottom", - "-moz-window-frame-left", - "-moz-window-frame-right", "-moz-window-titlebar", "-moz-window-titlebar-maximized", "auto", @@ -3476,9 +3470,6 @@ exports.CSS_PROPERTIES = { "-moz-window-button-maximize", "-moz-window-button-minimize", "-moz-window-button-restore", - "-moz-window-frame-bottom", - "-moz-window-frame-left", - "-moz-window-frame-right", "-moz-window-titlebar", "-moz-window-titlebar-maximized", "auto", diff --git a/layout/style/test/test_non_content_accessible_values.html b/layout/style/test/test_non_content_accessible_values.html index 79c2acf8761e..2e0786fc3f71 100644 --- a/layout/style/test/test_non_content_accessible_values.html +++ b/layout/style/test/test_non_content_accessible_values.html @@ -98,9 +98,6 @@ const NON_CONTENT_ACCESSIBLE_VALUES = { "-moz-window-button-maximize", "-moz-window-button-minimize", "-moz-window-button-restore", - "-moz-window-frame-bottom", - "-moz-window-frame-left", - "-moz-window-frame-right", "-moz-window-titlebar", "-moz-window-titlebar-maximized", "-moz-mac-active-source-list-selection", diff --git a/servo/components/style/values/specified/box.rs b/servo/components/style/values/specified/box.rs index c5f691ff640e..aa80d79db1e0 100644 --- a/servo/components/style/values/specified/box.rs +++ b/servo/components/style/values/specified/box.rs @@ -2035,12 +2035,6 @@ pub enum Appearance { #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")] MozWindowButtonRestore, #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")] - MozWindowFrameBottom, - #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")] - MozWindowFrameLeft, - #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")] - MozWindowFrameRight, - #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")] MozWindowTitlebar, #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")] MozWindowTitlebarMaximized, diff --git a/widget/windows/nsNativeThemeWin.cpp b/widget/windows/nsNativeThemeWin.cpp index a727b59ff7ff..df7cdf8e59bb 100644 --- a/widget/windows/nsNativeThemeWin.cpp +++ b/widget/windows/nsNativeThemeWin.cpp @@ -747,9 +747,6 @@ mozilla::Maybe nsNativeThemeWin::GetThemeClass( return Some(eUXMenu); case StyleAppearance::MozWindowTitlebar: case StyleAppearance::MozWindowTitlebarMaximized: - case StyleAppearance::MozWindowFrameLeft: - case StyleAppearance::MozWindowFrameRight: - case StyleAppearance::MozWindowFrameBottom: case StyleAppearance::MozWindowButtonClose: case StyleAppearance::MozWindowButtonMinimize: case StyleAppearance::MozWindowButtonMaximize: @@ -1323,18 +1320,6 @@ nsresult nsNativeThemeWin::GetThemePartAndState(nsIFrame* aFrame, aPart = mozilla::widget::themeconst::WP_MAXCAPTION; aState = GetTopLevelWindowActiveState(aFrame); return NS_OK; - case StyleAppearance::MozWindowFrameLeft: - aPart = mozilla::widget::themeconst::WP_FRAMELEFT; - aState = GetTopLevelWindowActiveState(aFrame); - return NS_OK; - case StyleAppearance::MozWindowFrameRight: - aPart = mozilla::widget::themeconst::WP_FRAMERIGHT; - aState = GetTopLevelWindowActiveState(aFrame); - return NS_OK; - case StyleAppearance::MozWindowFrameBottom: - aPart = mozilla::widget::themeconst::WP_FRAMEBOTTOM; - aState = GetTopLevelWindowActiveState(aFrame); - return NS_OK; case StyleAppearance::MozWindowButtonClose: aPart = mozilla::widget::themeconst::WP_CLOSEBUTTON; aState = GetWindowFrameButtonState(aFrame, @@ -1418,9 +1403,6 @@ nsNativeThemeWin::DrawWidgetBackground(gfxContext* aContext, nsIFrame* aFrame, switch (aAppearance) { case StyleAppearance::MozWindowTitlebar: case StyleAppearance::MozWindowTitlebarMaximized: - case StyleAppearance::MozWindowFrameLeft: - case StyleAppearance::MozWindowFrameRight: - case StyleAppearance::MozWindowFrameBottom: // Nothing to draw, these areas are glass. Minimum dimensions // should be set, so xul content should be layed out correctly. return NS_OK; @@ -2233,11 +2215,6 @@ LayoutDeviceIntSize nsNativeThemeWin::GetMinimumWidgetSize( break; } - case StyleAppearance::MozWindowFrameLeft: - case StyleAppearance::MozWindowFrameRight: - case StyleAppearance::MozWindowFrameBottom: - return {GetSystemMetrics(SM_CXFRAME), GetSystemMetrics(SM_CYFRAME)}; - default: break; } @@ -2281,9 +2258,6 @@ nsNativeThemeWin::WidgetStateChanged(nsIFrame* aFrame, if (aAppearance == StyleAppearance::MozWindowTitlebar || aAppearance == StyleAppearance::MozWindowTitlebarMaximized || - aAppearance == StyleAppearance::MozWindowFrameLeft || - aAppearance == StyleAppearance::MozWindowFrameRight || - aAppearance == StyleAppearance::MozWindowFrameBottom || aAppearance == StyleAppearance::MozWindowButtonClose || aAppearance == StyleAppearance::MozWindowButtonMinimize || aAppearance == StyleAppearance::MozWindowButtonMaximize || @@ -2395,9 +2369,6 @@ bool nsNativeThemeWin::WidgetAppearanceDependsOnWindowFocus( switch (aAppearance) { case StyleAppearance::MozWindowTitlebar: case StyleAppearance::MozWindowTitlebarMaximized: - case StyleAppearance::MozWindowFrameLeft: - case StyleAppearance::MozWindowFrameRight: - case StyleAppearance::MozWindowFrameBottom: case StyleAppearance::MozWindowButtonClose: case StyleAppearance::MozWindowButtonMinimize: case StyleAppearance::MozWindowButtonMaximize: @@ -2512,9 +2483,6 @@ bool nsNativeThemeWin::ClassicThemeSupportsWidget(nsIFrame* aFrame, case StyleAppearance::Menuitemtext: case StyleAppearance::MozWindowTitlebar: case StyleAppearance::MozWindowTitlebarMaximized: - case StyleAppearance::MozWindowFrameLeft: - case StyleAppearance::MozWindowFrameRight: - case StyleAppearance::MozWindowFrameBottom: case StyleAppearance::MozWindowButtonClose: case StyleAppearance::MozWindowButtonMinimize: case StyleAppearance::MozWindowButtonMaximize: @@ -2678,15 +2646,6 @@ LayoutDeviceIntSize nsNativeThemeWin::ClassicGetMinimumWidgetSize( result.height = GetSystemMetrics(SM_CYCAPTION) + GetSystemMetrics(SM_CYFRAME); break; - case StyleAppearance::MozWindowFrameLeft: - case StyleAppearance::MozWindowFrameRight: - result.width = GetSystemMetrics(SM_CXFRAME); - break; - - case StyleAppearance::MozWindowFrameBottom: - result.height = GetSystemMetrics(SM_CYFRAME); - break; - case StyleAppearance::MozWindowButtonClose: case StyleAppearance::MozWindowButtonMinimize: case StyleAppearance::MozWindowButtonMaximize: @@ -2948,18 +2907,6 @@ nsresult nsNativeThemeWin::ClassicGetThemePartAndState( aPart = mozilla::widget::themeconst::WP_MAXCAPTION; aState = GetTopLevelWindowActiveState(aFrame); return NS_OK; - case StyleAppearance::MozWindowFrameLeft: - aPart = mozilla::widget::themeconst::WP_FRAMELEFT; - aState = GetTopLevelWindowActiveState(aFrame); - return NS_OK; - case StyleAppearance::MozWindowFrameRight: - aPart = mozilla::widget::themeconst::WP_FRAMERIGHT; - aState = GetTopLevelWindowActiveState(aFrame); - return NS_OK; - case StyleAppearance::MozWindowFrameBottom: - aPart = mozilla::widget::themeconst::WP_FRAMEBOTTOM; - aState = GetTopLevelWindowActiveState(aFrame); - return NS_OK; case StyleAppearance::MozWindowButtonClose: aPart = DFC_CAPTION; aState = DFCS_CAPTIONCLOSE | GetClassicWindowFrameButtonState( @@ -3475,18 +3422,6 @@ RENDER_AGAIN: break; } - case StyleAppearance::MozWindowFrameLeft: - DrawEdge(hdc, &widgetRect, EDGE_RAISED, BF_LEFT); - break; - - case StyleAppearance::MozWindowFrameRight: - DrawEdge(hdc, &widgetRect, EDGE_RAISED, BF_RIGHT); - break; - - case StyleAppearance::MozWindowFrameBottom: - DrawEdge(hdc, &widgetRect, EDGE_RAISED, BF_BOTTOM); - break; - case StyleAppearance::MozWindowButtonClose: case StyleAppearance::MozWindowButtonMinimize: case StyleAppearance::MozWindowButtonMaximize: