Skip to content

Commit e718003

Browse files
committed
Backout 7a8b935ab596 (bug 674370) for Paint regression
1 parent aa0a90e commit e718003

File tree

12 files changed

+27
-112
lines changed

12 files changed

+27
-112
lines changed

browser/base/content/browser.xul

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@
9090
lightweightthemes="true"
9191
lightweightthemesfooter="browser-bottombox"
9292
windowtype="navigator:browser"
93-
macanimationtype="document"
9493
screenX="4" screenY="4"
9594
browsingmode="normal"
9695
persist="screenX screenY width height sizemode">

browser/components/sessionstore/src/nsSessionStore.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3810,7 +3810,7 @@ SessionStoreService.prototype = {
38103810
argString.data = "";
38113811

38123812
// Build feature string
3813-
let features = "chrome,dialog=no,macsuppressanimation,all";
3813+
let features = "chrome,dialog=no,all";
38143814
let winState = aState.windows[0];
38153815
WINDOW_ATTRIBUTES.forEach(function(aFeature) {
38163816
// Use !isNaN as an easy way to ignore sizemode and check for numbers

browser/devtools/scratchpad/scratchpad.xul

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
5252
title="&window.title;"
5353
windowtype="devtools:scratchpad"
54-
macanimationtype="document"
5554
screenX="4" screenY="4"
5655
width="640" height="480"
5756
persist="screenX screenY width height sizemode">

embedding/browser/webBrowser/nsIWebBrowserChrome.idl

Lines changed: 25 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ interface nsIDocShellTreeItem;
4747
* containing an embedded Gecko web browser.
4848
*/
4949

50-
[scriptable, uuid(E8C414C4-DC38-4BA3-AB4E-EC4CBBE22907)]
50+
[scriptable, uuid(BA434C60-9D52-11d3-AFB0-00A024FFC08C)]
5151
interface nsIWebBrowserChrome : nsISupports
5252
{
5353
const unsigned long STATUS_SCRIPT = 0x00000001;
@@ -75,47 +75,43 @@ interface nsIWebBrowserChrome : nsISupports
7575
/**
7676
* Definitions for the chrome flags
7777
*/
78-
const unsigned long CHROME_DEFAULT = 0x00000001;
79-
const unsigned long CHROME_WINDOW_BORDERS = 0x00000002;
80-
const unsigned long CHROME_WINDOW_CLOSE = 0x00000004;
81-
const unsigned long CHROME_WINDOW_RESIZE = 0x00000008;
82-
const unsigned long CHROME_MENUBAR = 0x00000010;
83-
const unsigned long CHROME_TOOLBAR = 0x00000020;
84-
const unsigned long CHROME_LOCATIONBAR = 0x00000040;
85-
const unsigned long CHROME_STATUSBAR = 0x00000080;
86-
const unsigned long CHROME_PERSONAL_TOOLBAR = 0x00000100;
87-
const unsigned long CHROME_SCROLLBARS = 0x00000200;
88-
const unsigned long CHROME_TITLEBAR = 0x00000400;
89-
const unsigned long CHROME_EXTRA = 0x00000800;
78+
const unsigned long CHROME_DEFAULT = 0x00000001;
79+
const unsigned long CHROME_WINDOW_BORDERS = 0x00000002;
80+
const unsigned long CHROME_WINDOW_CLOSE = 0x00000004;
81+
const unsigned long CHROME_WINDOW_RESIZE = 0x00000008;
82+
const unsigned long CHROME_MENUBAR = 0x00000010;
83+
const unsigned long CHROME_TOOLBAR = 0x00000020;
84+
const unsigned long CHROME_LOCATIONBAR = 0x00000040;
85+
const unsigned long CHROME_STATUSBAR = 0x00000080;
86+
const unsigned long CHROME_PERSONAL_TOOLBAR = 0x00000100;
87+
const unsigned long CHROME_SCROLLBARS = 0x00000200;
88+
const unsigned long CHROME_TITLEBAR = 0x00000400;
89+
const unsigned long CHROME_EXTRA = 0x00000800;
9090

9191
// createBrowserWindow specific flags
92-
const unsigned long CHROME_WITH_SIZE = 0x00001000;
93-
const unsigned long CHROME_WITH_POSITION = 0x00002000;
92+
const unsigned long CHROME_WITH_SIZE = 0x00001000;
93+
const unsigned long CHROME_WITH_POSITION = 0x00002000;
9494

9595
// special cases
96-
const unsigned long CHROME_WINDOW_MIN = 0x00004000;
97-
const unsigned long CHROME_WINDOW_POPUP = 0x00008000;
96+
const unsigned long CHROME_WINDOW_MIN = 0x00004000;
97+
const unsigned long CHROME_WINDOW_POPUP = 0x00008000;
9898

99-
// Prevents new window animations on Mac OS X Lion. Ignored on other
100-
// platforms.
101-
const unsigned long CHROME_MAC_SUPPRESS_ANIMATION = 0x01000000;
102-
103-
const unsigned long CHROME_WINDOW_RAISED = 0x02000000;
104-
const unsigned long CHROME_WINDOW_LOWERED = 0x04000000;
105-
const unsigned long CHROME_CENTER_SCREEN = 0x08000000;
99+
const unsigned long CHROME_WINDOW_RAISED = 0x02000000;
100+
const unsigned long CHROME_WINDOW_LOWERED = 0x04000000;
101+
const unsigned long CHROME_CENTER_SCREEN = 0x08000000;
106102

107103
// Make the new window dependent on the parent. This flag is only
108104
// meaningful if CHROME_OPENAS_CHROME is set; content windows should not be
109105
// dependent.
110-
const unsigned long CHROME_DEPENDENT = 0x10000000;
106+
const unsigned long CHROME_DEPENDENT = 0x10000000;
111107

112108
// Note: The modal style bit just affects the way the window looks and does
113109
// mean it's actually modal.
114-
const unsigned long CHROME_MODAL = 0x20000000;
115-
const unsigned long CHROME_OPENAS_DIALOG = 0x40000000;
116-
const unsigned long CHROME_OPENAS_CHROME = 0x80000000;
110+
const unsigned long CHROME_MODAL = 0x20000000;
111+
const unsigned long CHROME_OPENAS_DIALOG = 0x40000000;
112+
const unsigned long CHROME_OPENAS_CHROME = 0x80000000;
117113

118-
const unsigned long CHROME_ALL = 0x00000ffe;
114+
const unsigned long CHROME_ALL = 0x00000ffe;
119115

120116
/**
121117
* The chrome flags for this browser chrome. The implementation should

embedding/components/windowwatcher/src/nsWindowWatcher.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1527,9 +1527,6 @@ PRUint32 nsWindowWatcher::CalculateChromeFlags(const char *aFeatures,
15271527
else if (WinHasOption(aFeatures, "alwaysRaised", 0, nsnull))
15281528
chromeFlags |= nsIWebBrowserChrome::CHROME_WINDOW_RAISED;
15291529

1530-
chromeFlags |= WinHasOption(aFeatures, "macsuppressanimation", 0, nsnull) ?
1531-
nsIWebBrowserChrome::CHROME_MAC_SUPPRESS_ANIMATION : 0;
1532-
15331530
chromeFlags |= WinHasOption(aFeatures, "chrome", 0, nsnull) ?
15341531
nsIWebBrowserChrome::CHROME_OPENAS_CHROME : 0;
15351532
chromeFlags |= WinHasOption(aFeatures, "extrachrome", 0, nsnull) ?

widget/cocoa/nsCocoaWindow.h

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -197,21 +197,6 @@ typedef struct _nsCocoaWindowList {
197197
- (void)setDrawsContentsIntoWindowFrame:(BOOL)aState;
198198
@end
199199

200-
#if !defined(MAC_OS_X_VERSION_10_7) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7)
201-
enum {
202-
NSWindowAnimationBehaviorDefault = 0,
203-
NSWindowAnimationBehaviorNone = 2,
204-
NSWindowAnimationBehaviorDocumentWindow = 3,
205-
NSWindowAnimationBehaviorUtilityWindow = 4,
206-
NSWindowAnimationBehaviorAlertPanel = 5
207-
};
208-
typedef NSInteger NSWindowAnimationBehavior;
209-
210-
@interface NSWindow (LionWindowFeatures)
211-
- (void)setAnimationBehavior:(NSWindowAnimationBehavior)newAnimationBehavior;
212-
@end
213-
#endif
214-
215200
class nsCocoaWindow : public nsBaseWidget, public nsPIWidgetCocoa
216201
{
217202
private:
@@ -281,7 +266,6 @@ class nsCocoaWindow : public nsBaseWidget, public nsPIWidgetCocoa
281266
virtual void SetTransparencyMode(nsTransparencyMode aMode);
282267
NS_IMETHOD SetWindowShadowStyle(PRInt32 aStyle);
283268
virtual void SetShowsToolbarButton(bool aShow);
284-
virtual void SetWindowAnimationType(WindowAnimationType aType);
285269
NS_IMETHOD SetWindowTitlebarColor(nscolor aColor, bool aActive);
286270
virtual void SetDrawsInTitlebar(bool aState);
287271
virtual nsresult SynthesizeNativeMouseEvent(nsIntPoint aPoint,
@@ -351,16 +335,12 @@ class nsCocoaWindow : public nsBaseWidget, public nsPIWidgetCocoa
351335
PRInt32 mShadowStyle;
352336
NSUInteger mWindowFilter;
353337

354-
WindowAnimationType mAnimationType;
355-
356338
bool mWindowMadeHere; // true if we created the window, false for embedding
357339
bool mSheetNeedsShow; // if this is a sheet, are we waiting to be shown?
358340
// this is used for sibling sheet contention only
359341
bool mFullScreen;
360342
bool mModal;
361343

362-
bool mIsAnimationSuppressed;
363-
364344
bool mInReportMoveEvent; // true if in a call to ReportMoveEvent().
365345

366346
PRInt32 mNumModalDescendents;

widget/cocoa/nsCocoaWindow.mm

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,10 @@ static void RollUpPopups()
135135
, mPopupContentView(nil)
136136
, mShadowStyle(NS_STYLE_WINDOW_SHADOW_DEFAULT)
137137
, mWindowFilter(0)
138-
, mAnimationType(nsIWidget::eGenericWindowAnimation)
139138
, mWindowMadeHere(false)
140139
, mSheetNeedsShow(false)
141140
, mFullScreen(false)
142141
, mModal(false)
143-
, mIsAnimationSuppressed(false)
144142
, mInReportMoveEvent(false)
145143
, mNumModalDescendents(0)
146144
{
@@ -306,8 +304,6 @@ static bool UseNativePopupWindows()
306304
return CreatePopupContentView(newBounds, aHandleEventFunction, aContext);
307305
}
308306

309-
mIsAnimationSuppressed = aInitData->mIsAnimationSuppressed;
310-
311307
return NS_OK;
312308

313309
NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
@@ -749,26 +745,6 @@ static unsigned int WindowMaskForBorderStyle(nsBorderStyle aBorderStyle)
749745
}
750746
else {
751747
NS_OBJC_BEGIN_TRY_LOGONLY_BLOCK;
752-
if (mWindowType == eWindowType_toplevel &&
753-
[mWindow respondsToSelector:@selector(setAnimationBehavior:)]) {
754-
NSWindowAnimationBehavior behavior;
755-
if (mIsAnimationSuppressed) {
756-
behavior = NSWindowAnimationBehaviorNone;
757-
} else {
758-
switch (mAnimationType) {
759-
case nsIWidget::eDocumentWindowAnimation:
760-
behavior = NSWindowAnimationBehaviorDocumentWindow;
761-
break;
762-
default:
763-
NS_NOTREACHED("unexpected mAnimationType value");
764-
// fall through
765-
case nsIWidget::eGenericWindowAnimation:
766-
behavior = NSWindowAnimationBehaviorDefault;
767-
break;
768-
}
769-
}
770-
[mWindow setAnimationBehavior:behavior];
771-
}
772748
[mWindow makeKeyAndOrderFront:nil];
773749
NS_OBJC_END_TRY_LOGONLY_BLOCK;
774750
SendSetZLevelEvent();
@@ -1631,11 +1607,6 @@ nsIntRect screenBounds(
16311607
NS_OBJC_END_TRY_ABORT_BLOCK;
16321608
}
16331609

1634-
void nsCocoaWindow::SetWindowAnimationType(nsIWidget::WindowAnimationType aType)
1635-
{
1636-
mAnimationType = aType;
1637-
}
1638-
16391610
NS_IMETHODIMP nsCocoaWindow::SetWindowTitlebarColor(nscolor aColor, bool aActive)
16401611
{
16411612
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;

widget/nsIWidget.h

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,20 +1017,6 @@ class nsIWidget : public nsISupports {
10171017
*/
10181018
virtual void SetShowsToolbarButton(bool aShow) = 0;
10191019

1020-
enum WindowAnimationType {
1021-
eGenericWindowAnimation,
1022-
eDocumentWindowAnimation
1023-
};
1024-
1025-
/**
1026-
* Sets the kind of top-level window animation this widget should have. On
1027-
* Mac OS X, this causes a particular kind of animation to be shown when the
1028-
* window is first made visible.
1029-
*
1030-
* Ignored on child widgets and on non-Mac platforms.
1031-
*/
1032-
virtual void SetWindowAnimationType(WindowAnimationType aType) = 0;
1033-
10341020
/**
10351021
* Hide window chrome (borders, buttons) for this widget.
10361022
*

widget/nsWidgetInitData.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,7 @@ struct nsWidgetInitData {
133133
mUnicode(true),
134134
mRTL(false),
135135
mNoAutoHide(false),
136-
mIsDragPopup(false),
137-
mIsAnimationSuppressed(false)
136+
mIsDragPopup(false)
138137
{
139138
}
140139

@@ -149,8 +148,6 @@ struct nsWidgetInitData {
149148
bool mRTL;
150149
bool mNoAutoHide; // true for noautohide panels
151150
bool mIsDragPopup; // true for drag feedback panels
152-
bool mIsAnimationSuppressed; // true if window creation animation is
153-
// suppressed, e.g. for session restore
154151
};
155152

156153
#endif // nsWidgetInitData_h__

widget/xpwidgets/nsBaseWidget.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ class nsBaseWidget : public nsIWidget
123123
virtual void GetWindowClipRegion(nsTArray<nsIntRect>* aRects);
124124
NS_IMETHOD SetWindowShadowStyle(PRInt32 aStyle);
125125
virtual void SetShowsToolbarButton(bool aShow) {}
126-
virtual void SetWindowAnimationType(WindowAnimationType aType) {}
127126
NS_IMETHOD HideWindowChrome(bool aShouldHide);
128127
NS_IMETHOD MakeFullScreen(bool aFullScreen);
129128
virtual nsDeviceContext* GetDeviceContext();

0 commit comments

Comments
 (0)