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

Bug 769998 - Make nsIWidget::IsVisible return bool, r=roc, f=ms2ger

Browse Source
This commit is contained in:
Mark Capella 2012-07-19 04:57:50 -04:00
parent 2e09b6b8d9
commit bf92974758
23 changed files with 60 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
accessible/src/msaa/AccessibleWrap.cpp
View File

@ -1626,21 +1626,17 @@ AccessibleWrap::GetHWNDFor(Accessible* aAccessible)
nsIFrame* frame = aAccessible->GetFrame();
if (frame) {
nsIWidget* widget = frame->GetNearestWidget();
if (widget) {
bool isVisible = false;
widget->IsVisible(isVisible);
if (isVisible) {
nsIPresShell* shell = document->PresShell();
nsIViewManager* vm = shell->GetViewManager();
if (vm) {
nsCOMPtr<nsIWidget> rootWidget;
vm->GetRootWidget(getter_AddRefs(rootWidget));
// Make sure the accessible belongs to popup. If not then use
// document HWND (which might be different from root widget in the
// case of window emulation).
if (rootWidget != widget)
return static_cast<HWND>(widget->GetNativeData(NS_NATIVE_WINDOW));
}
if (widget && widget->IsVisible()) {
nsIPresShell* shell = document->PresShell();
nsIViewManager* vm = shell->GetViewManager();
if (vm) {
nsCOMPtr<nsIWidget> rootWidget;
vm->GetRootWidget(getter_AddRefs(rootWidget));
// Make sure the accessible belongs to popup. If not then use
// document HWND (which might be different from root widget in the
// case of window emulation).
if (rootWidget != widget)
return static_cast<HWND>(widget->GetNativeData(NS_NATIVE_WINDOW));
}
}
}

2
dom/plugins/base/nsPluginHost.cpp
View File

@ -3873,7 +3873,7 @@ CheckForDisabledWindows()
nsCOMPtr<nsIWidget> widget;
baseWin->GetMainWidget(getter_AddRefs(widget));
if (widget && !widget->GetParent() &&
NS_SUCCEEDED(widget->IsVisible(aFlag)) && aFlag == true &&
widget->IsVisible() &&
NS_SUCCEEDED(widget->IsEnabled(&aFlag)) && aFlag == false) {
nsIWidget * child = widget->GetFirstChild();
bool enable = true;

6
embedding/components/windowwatcher/src/nsWindowWatcher.cpp
View File

@ -646,16 +646,12 @@ nsWindowWatcher::OpenWindowJSInternal(nsIDOMWindow *aParent,
// where we can't shut down because an invisible window is open. If
// someone tries to do this, throw.
if (!hasChromeParent && (chromeFlags & nsIWebBrowserChrome::CHROME_MODAL)) {
bool parentVisible = true;
nsCOMPtr<nsIBaseWindow> parentWindow(do_GetInterface(parentTreeOwner));
nsCOMPtr<nsIWidget> parentWidget;
if (parentWindow)
parentWindow->GetMainWidget(getter_AddRefs(parentWidget));
if (parentWidget)
parentWidget->IsVisible(parentVisible);
if (!parentVisible) {
if (parentWidget && !parentWidget->IsVisible())
return NS_ERROR_NOT_AVAILABLE;
}
}
NS_ASSERTION(mWindowCreator,

11
view/src/nsViewManager.cpp
View File

@ -442,11 +442,8 @@ nsViewManager::InvalidateWidgetArea(nsView *aWidgetView,
#endif
// If the widget is hidden, it don't cover nothing
if (widget) {
bool visible;
widget->IsVisible(visible);
if (!visible)
return;
if (widget && !widget->IsVisible()) {
return;
}
if (!widget) {
@ -466,11 +463,9 @@ nsViewManager::InvalidateWidgetArea(nsView *aWidgetView,
childWidget = childWidget->GetNextSibling()) {
nsView* view = nsView::GetViewFor(childWidget);
NS_ASSERTION(view != aWidgetView, "will recur infinitely");
bool visible;
childWidget->IsVisible(visible);
nsWindowType type;
childWidget->GetWindowType(type);
if (view && visible && type != eWindowType_popup) {
if (view && childWidget->IsVisible() && type != eWindowType_popup) {
NS_ASSERTION(type == eWindowType_plugin,
"Only plugin or popup widgets can be children!");

7
widget/android/nsWindow.cpp
View File

@ -384,11 +384,10 @@ nsWindow::SetModal(bool aState)
return NS_OK;
}
NS_IMETHODIMP
nsWindow::IsVisible(bool& aState)
bool
nsWindow::IsVisible() const
{
aState = mIsVisible;
return NS_OK;
return mIsVisible;
}
NS_IMETHODIMP

2
widget/android/nsWindow.h
View File

@ -76,7 +76,7 @@ public:
virtual float GetDPI();
NS_IMETHOD Show(bool aState);
NS_IMETHOD SetModal(bool aModal);
NS_IMETHOD IsVisible(bool & aState);
virtual bool IsVisible() const;
NS_IMETHOD ConstrainPosition(bool aAllowSlop,
PRInt32 *aX,
PRInt32 *aY);

2
widget/cocoa/nsChildView.h
View File

@ -395,7 +395,7 @@ public:
NS_IMETHOD Destroy();
NS_IMETHOD Show(bool aState);
NS_IMETHOD IsVisible(bool& outState);
virtual bool IsVisible() const;
NS_IMETHOD SetParent(nsIWidget* aNewParent);
virtual nsIWidget* GetParent(void);

30
widget/cocoa/nsChildView.mm
View File

@ -526,26 +526,20 @@ void nsChildView::SetTransparencyMode(nsTransparencyMode aMode)
NS_OBJC_END_TRY_ABORT_BLOCK;
}
NS_IMETHODIMP nsChildView::IsVisible(bool& outState)
bool nsChildView::IsVisible() const
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
if (!mVisible) {
outState = mVisible;
}
else {
// mVisible does not accurately reflect the state of a hidden tabbed view
// so verify that the view has a window as well
outState = ([mView window] != nil);
// now check native widget hierarchy visibility
if (outState && NSIsEmptyRect([mView visibleRect])) {
outState = false;
}
return mVisible;
}
return NS_OK;
// mVisible does not accurately reflect the state of a hidden tabbed view
// so verify that the view has a window as well
// then check native widget hierarchy visibility
return ([mView window] != nil) && !NSIsEmptyRect([mView visibleRect]);
NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(false);
}
void nsChildView::HidePlugin()
@ -976,9 +970,7 @@ NS_IMETHODIMP nsChildView::GetPluginClipRect(nsIntRect& outClipRect, nsIntPoint&
outOrigin.x = -NSToIntRound(viewOrigin.x);
outOrigin.y = -NSToIntRound(viewOrigin.y);
bool isVisible;
IsVisible(isVisible);
if (isVisible && [mView window] != nil) {
if (IsVisible() && [mView window] != nil) {
outClipRect.width = NSToIntRound(visibleBounds.origin.x + visibleBounds.size.width) - NSToIntRound(visibleBounds.origin.x);
outClipRect.height = NSToIntRound(visibleBounds.origin.y + visibleBounds.size.height) - NSToIntRound(visibleBounds.origin.y);
@ -2484,9 +2476,7 @@ NSEvent* gLastDragMouseDownEvent = nil;
- (void)drawRect:(NSRect)aRect inContext:(CGContextRef)aContext
{
SAMPLE_LABEL("widget", "ChildView::drawRect");
bool isVisible;
if (!mGeckoChild || NS_FAILED(mGeckoChild->IsVisible(isVisible)) ||
!isVisible)
if (!mGeckoChild || !mGeckoChild->IsVisible())
return;
#ifndef NP_NO_QUICKDRAW

2
widget/cocoa/nsCocoaWindow.h
View File

@ -214,7 +214,7 @@ public:
NS_IMETHOD Enable(bool aState);
NS_IMETHOD IsEnabled(bool *aState);
NS_IMETHOD SetModal(bool aState);
NS_IMETHOD IsVisible(bool & aState);
virtual bool IsVisible() const;
NS_IMETHOD SetFocus(bool aState=false);
virtual nsIntPoint WidgetToScreenOffset();
virtual nsIntPoint GetClientOffset();

9
widget/cocoa/nsCocoaWindow.mm
View File

@ -545,14 +545,13 @@ void* nsCocoaWindow::GetNativeData(PRUint32 aDataType)
NS_OBJC_END_TRY_ABORT_BLOCK_NSNULL;
}
NS_IMETHODIMP nsCocoaWindow::IsVisible(bool & aState)
bool nsCocoaWindow::IsVisible() const
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
aState = (mWindow && ([mWindow isVisible] || mSheetNeedsShow));
return NS_OK;
return (mWindow && ([mWindow isVisible] || mSheetNeedsShow));
NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(false);
}
NS_IMETHODIMP nsCocoaWindow::SetModal(bool aState)

7
widget/gonk/nsWindow.cpp
View File

@ -319,11 +319,10 @@ nsWindow::Show(bool aState)
return NS_OK;
}
NS_IMETHODIMP
nsWindow::IsVisible(bool & aState)
bool
nsWindow::IsVisible() const
{
aState = mVisible;
return NS_OK;
return mVisible;
}
NS_IMETHODIMP

2
widget/gonk/nsWindow.h
View File

@ -46,7 +46,7 @@ public:
NS_IMETHOD Destroy(void);
NS_IMETHOD Show(bool aState);
NS_IMETHOD IsVisible(bool & aState);
virtual bool IsVisible() const;
NS_IMETHOD ConstrainPosition(bool aAllowSlop,
PRInt32 *aX,
PRInt32 *aY);

7
widget/gtk2/nsWindow.cpp
View File

@ -908,11 +908,10 @@ nsWindow::SetModal(bool aModal)
}
// nsIWidget method, which means IsShown.
NS_IMETHODIMP
nsWindow::IsVisible(bool& aState)
bool
nsWindow::IsVisible() const
{
aState = mIsShown;
return NS_OK;
return mIsShown;
}
NS_IMETHODIMP

2
widget/gtk2/nsWindow.h
View File

@ -107,7 +107,7 @@ public:
virtual float GetDPI();
virtual nsresult SetParent(nsIWidget* aNewParent);
NS_IMETHOD SetModal(bool aModal);
NS_IMETHOD IsVisible(bool & aState);
virtual bool IsVisible() const;
NS_IMETHOD ConstrainPosition(bool aAllowSlop,
PRInt32 *aX,
PRInt32 *aY);

2
widget/nsIWidget.h
View File

@ -609,7 +609,7 @@ class nsIWidget : public nsISupports {
* Returns whether the window is visible
*
*/
NS_IMETHOD IsVisible(bool & aState) = 0;
virtual bool IsVisible() const = 0;
/**
* Perform platform-dependent sanity check on a potential window position.

9
widget/os2/nsWindow.cpp
View File

@ -585,9 +585,7 @@ NS_METHOD nsWindow::Show(bool aState)
// don't try to show new windows (e.g. the Bookmark menu)
// during a native dragover because they'll remain invisible;
if (CheckDragStatus(ACTION_SHOW, 0)) {
bool isVisible;
IsVisible(isVisible);
if (!isVisible) {
if (!IsVisible()) {
PlaceBehind(eZPlacementTop, 0, false);
}
WinShowWindow(mWnd, true);
@ -602,10 +600,9 @@ NS_METHOD nsWindow::Show(bool aState)
//-----------------------------------------------------------------------------
NS_METHOD nsWindow::IsVisible(bool& aState)
bool nsWindow::IsVisible() const
{
aState = WinIsWindowVisible(GetMainWindow()) ? true : false;
return NS_OK;
return WinIsWindowVisible(GetMainWindow());
}
//-----------------------------------------------------------------------------

2
widget/os2/nsWindow.h
View File

@ -140,7 +140,7 @@ public:
NS_IMETHOD Enable(bool aState);
NS_IMETHOD IsEnabled(bool* aState);
NS_IMETHOD Show(bool aState);
NS_IMETHOD IsVisible(bool& aState);
virtual bool IsVisible() const;
NS_IMETHOD SetFocus(bool aRaise);
NS_IMETHOD Invalidate(const nsIntRect& aRect);
gfxASurface* GetThebesSurface();

7
widget/qt/nsWindow.cpp
View File

@ -475,11 +475,10 @@ nsWindow::SetModal(bool aModal)
return NS_OK;
}
NS_IMETHODIMP
nsWindow::IsVisible(bool & aState)
bool
nsWindow::IsVisible() const
{
aState = mIsShown;
return NS_OK;
return mIsShown;
}
NS_IMETHODIMP

2
widget/qt/nsWindow.h
View File

@ -112,7 +112,7 @@ public:
virtual float GetDPI();
NS_IMETHOD Show(bool aState);
NS_IMETHOD SetModal(bool aModal);
NS_IMETHOD IsVisible(bool & aState);
virtual bool IsVisible() const;
NS_IMETHOD ConstrainPosition(bool aAllowSlop,
PRInt32 *aX,
PRInt32 *aY);

5
widget/windows/nsWindow.cpp
View File

@ -1190,10 +1190,9 @@ NS_METHOD nsWindow::Show(bool bState)
**************************************************************/
// Return true if the whether the component is visible, false otherwise
NS_METHOD nsWindow::IsVisible(bool & bState)
bool nsWindow::IsVisible() const
{
bState = mIsVisible;
return NS_OK;
return mIsVisible;
}
/**************************************************************

2
widget/windows/nsWindow.h
View File

@ -92,7 +92,7 @@ public:
virtual nsIWidget* GetParent(void);
virtual float GetDPI();
NS_IMETHOD Show(bool bState);
NS_IMETHOD IsVisible(bool & aState);
virtual bool IsVisible() const;
NS_IMETHOD ConstrainPosition(bool aAllowSlop, PRInt32 *aX, PRInt32 *aY);
NS_IMETHOD Move(PRInt32 aX, PRInt32 aY);
NS_IMETHOD Resize(PRInt32 aWidth, PRInt32 aHeight, bool aRepaint);

5
widget/xpwidgets/PuppetWidget.h
View File

@ -64,8 +64,9 @@ public:
NS_IMETHOD Destroy();
NS_IMETHOD Show(bool aState);
NS_IMETHOD IsVisible(bool& aState)
{ aState = mVisible; return NS_OK; }
virtual bool IsVisible() const
{ return mVisible; }
NS_IMETHOD ConstrainPosition(bool /*ignored aAllowSlop*/,
PRInt32* aX,

5
xpfe/appshell/src/nsXULWindow.cpp
View File

@ -456,12 +456,9 @@ NS_IMETHODIMP nsXULWindow::Destroy()
// only if the parent is visible.
nsCOMPtr<nsIBaseWindow> parent(do_QueryReferent(mParentWindow));
if (parent) {
bool parentVisible = true;
nsCOMPtr<nsIWidget> parentWidget;
parent->GetMainWidget(getter_AddRefs(parentWidget));
if (parentWidget)
parentWidget->IsVisible(parentVisible);
if (parentVisible) {
if (!parentWidget || parentWidget->IsVisible()) {
nsCOMPtr<nsIBaseWindow> baseHiddenWindow;
if (appShell) {
nsCOMPtr<nsIXULWindow> hiddenWindow;