nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Backed out changeset 44d3452f6a07 (bug 1550721) for build bustages on nsWindow.cpp. CLOSED TREE

Browse source
This commit is contained in:
Brindusan Cristian 2019-09-17 02:27:52 +03:00
parent 880d097a69
commit e32489a0d8
7 changed files with 7 additions and 37 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

6
browser/base/content/browser.css
View file

@ -278,14 +278,12 @@ window:not([chromehidden~="toolbar"]) #nav-bar[nonemptyoverflow] > .overflow-but
}
%ifdef MOZ_WIDGET_GTK
@media (-moz-gtk-csd-reversed-placement: 0) {
:root:not([sizemode=normal]) .titlebar-spacer[type="pre-tabs"],
:root[gtktiledwindow=true] .titlebar-spacer[type="pre-tabs"] {
:root:not([sizemode=normal]) .titlebar-spacer[type="pre-tabs"] {
display: none;
}
}
@media (-moz-gtk-csd-reversed-placement) {
:root:not([sizemode=normal]) .titlebar-spacer[type="post-tabs"],
:root[gtktiledwindow=true] .titlebar-spacer[type="post-tabs"] {
:root:not([sizemode=normal]) .titlebar-spacer[type="post-tabs"] {
display: none;
}
}

2
browser/themes/linux/browser.css
View file

@ -488,7 +488,7 @@ notification[value="translation"] menulist > .menulist-dropmarker {
:root[tabsintitlebar] > #navigator-toolbox > #titlebar {
-moz-appearance: -moz-window-titlebar-maximized;
}
:root[tabsintitlebar][sizemode="normal"]:not([gtktiledwindow="true"]) > #navigator-toolbox > #titlebar {
:root[tabsintitlebar][sizemode="normal"] > #navigator-toolbox > #titlebar {
-moz-appearance: -moz-window-titlebar;
}
:root[tabsintitlebar]:not([inDOMFullscreen]) > #navigator-toolbox > #titlebar:-moz-lwtheme {

18
widget/gtk/nsWindow.cpp
View file

@ -3227,10 +3227,8 @@ void nsWindow::OnVisibilityNotifyEvent(GdkEventVisibility* aEvent) {
void nsWindow::OnWindowStateEvent(GtkWidget* aWidget,
GdkEventWindowState* aEvent) {
LOG(
("nsWindow::OnWindowStateEvent [%p] for %p changed 0x%x new_window_state "
"0x%x\n",
(void*)this, aWidget, aEvent->changed_mask, aEvent->new_window_state));
LOG(("nsWindow::OnWindowStateEvent [%p] changed %d new_window_state %d\n",
(void*)this, aEvent->changed_mask, aEvent->new_window_state));
if (IS_MOZ_CONTAINER(aWidget)) {
// This event is notifying the container widget of changes to the
@ -3248,7 +3246,6 @@ void nsWindow::OnWindowStateEvent(GtkWidget* aWidget,
if (mHasMappedToplevel != mapped) {
SetHasMappedToplevel(mapped);
}
LOG(("\tquick return because IS_MOZ_CONTAINER(aWidget) is true\n"));
return;
}
// else the widget is a shell widget.
@ -3309,8 +3306,7 @@ void nsWindow::OnWindowStateEvent(GtkWidget* aWidget,
if (!waylandWasIconified &&
(aEvent->changed_mask &
(GDK_WINDOW_STATE_ICONIFIED | GDK_WINDOW_STATE_MAXIMIZED |
GDK_WINDOW_STATE_TILED | GDK_WINDOW_STATE_FULLSCREEN)) == 0) {
LOG(("\tearly return because no interesting bits changed\n"));
GDK_WINDOW_STATE_FULLSCREEN)) == 0) {
return;
}
@ -3337,14 +3333,6 @@ void nsWindow::OnWindowStateEvent(GtkWidget* aWidget,
#endif // ACCESSIBILITY
}
if (aEvent->new_window_state & GDK_WINDOW_STATE_TILED) {
LOG(("\tTiled\n"));
mIsTiled = true;
} else {
LOG(("\tNot tiled\n"));
mIsTiled = false;
}
if (mWidgetListener) {
mWidgetListener->SizeModeChanged(mSizeState);
if (aEvent->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) {

1
widget/nsBaseWidget.cpp
View file

@ -168,7 +168,6 @@ nsBaseWidget::nsBaseWidget()
mOriginalBounds(nullptr),
mClipRectCount(0),
mSizeMode(nsSizeMode_Normal),
mIsTiled(false),
mPopupLevel(ePopupLevelTop),
mPopupType(ePopupTypeAny),
mHasRemoteContent(false),

2
widget/nsBaseWidget.h
View file

@ -167,7 +167,6 @@ class nsBaseWidget : public nsIWidget, public nsSupportsWeakReference {
virtual void SetSizeMode(nsSizeMode aMode) override;
virtual nsSizeMode SizeMode() override { return mSizeMode; }
virtual bool IsTiled() const override { return mIsTiled; }
virtual bool IsFullyOccluded() const override { return mIsFullyOccluded; }
@ -692,7 +691,6 @@ class nsBaseWidget : public nsIWidget, public nsSupportsWeakReference {
mozilla::UniquePtr<LayoutDeviceIntRect[]> mClipRects;
uint32_t mClipRectCount;
nsSizeMode mSizeMode;
bool mIsTiled;
nsPopupLevel mPopupLevel;
nsPopupType mPopupType;
SizeConstraints mSizeConstraints;

5
widget/nsIWidget.h
View file

@ -836,11 +836,6 @@ class nsIWidget : public nsISupports {
*/
virtual nsSizeMode SizeMode() = 0;
/**
* Ask whether the window is tiled.
*/
virtual bool IsTiled() const = 0;
/**
* Ask wether the widget is fully occluded
*/

10
xpfe/appshell/nsXULWindow.cpp
View file

@ -81,7 +81,6 @@ using dom::AutoNoJSAPI;
#define WIDTH_ATTRIBUTE NS_LITERAL_STRING("width")
#define HEIGHT_ATTRIBUTE NS_LITERAL_STRING("height")
#define MODE_ATTRIBUTE NS_LITERAL_STRING("sizemode")
#define TILED_ATTRIBUTE NS_LITERAL_STRING("gtktiledwindow")
#define ZLEVEL_ATTRIBUTE NS_LITERAL_STRING("zlevel")
//*****************************************************************************
@ -1296,7 +1295,7 @@ bool nsXULWindow::UpdateWindowStateFromMiscXULAttributes() {
// If we are told to ignore the size mode attribute, force
// normal sizemode.
if (mIgnoreXULSizeMode) {
windowElement->SetAttribute(MODE_ATTRIBUTE, SIZEMODE_NORMAL,
windowElement->SetAttribute(MODE_ATTRIBUTE, NS_LITERAL_STRING("normal"),
IgnoreErrors());
} else {
// Otherwise, read sizemode from DOM and, if the window is resizable,
@ -1784,13 +1783,6 @@ NS_IMETHODIMP nsXULWindow::SavePersistentAttributes() {
Unused << SetPersistentValue(nsGkAtoms::sizemode, sizeString);
}
}
bool tiled = mWindow->IsTiled();
if (tiled) {
sizeString.Assign(NS_LITERAL_STRING("true"));
} else {
sizeString.Assign(NS_LITERAL_STRING("false"));
}
docShellElement->SetAttribute(TILED_ATTRIBUTE, sizeString, rv);
if (persistString.Find("zlevel") >= 0) {
uint32_t zLevel;
nsCOMPtr<nsIWindowMediator> mediator(