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

Backed out changeset 9ac36968bff2 (bug 1149035)

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2015-03-30 15:03:30 +02:00
parent f23066ddcd
commit d32f1175f6
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
layout/xul/nsXULPopupManager.cpp
View File

@ -471,7 +471,7 @@ nsXULPopupManager::PopupMoved(nsIFrame* aFrame, nsIntPoint aPnt)
} }
void void
nsXULPopupManager::PopupResized(nsIFrame* aFrame, LayoutDeviceIntSize aSize) nsXULPopupManager::PopupResized(nsIFrame* aFrame, nsIntSize aSize)
{ {
nsMenuPopupFrame* menuPopupFrame = GetPopupToMoveOrResize(aFrame); nsMenuPopupFrame* menuPopupFrame = GetPopupToMoveOrResize(aFrame);
if (!menuPopupFrame) if (!menuPopupFrame)
@ -490,7 +490,7 @@ nsXULPopupManager::PopupResized(nsIFrame* aFrame, LayoutDeviceIntSize aSize)
// as 'width' and 'height' attributes on the popup. // as 'width' and 'height' attributes on the popup.
nsPresContext* presContext = menuPopupFrame->PresContext(); nsPresContext* presContext = menuPopupFrame->PresContext();
CSSIntSize newCSS(presContext->DevPixelsToIntCSSPixels(aSize.width), nsIntSize newCSS(presContext->DevPixelsToIntCSSPixels(aSize.width),
presContext->DevPixelsToIntCSSPixels(aSize.height)); presContext->DevPixelsToIntCSSPixels(aSize.height));
nsIContent* popup = menuPopupFrame->GetContent(); nsIContent* popup = menuPopupFrame->GetContent();

5
layout/xul/nsXULPopupManager.h
View File

@ -24,7 +24,6 @@
#include "nsStyleConsts.h" #include "nsStyleConsts.h"
#include "nsWidgetInitData.h" #include "nsWidgetInitData.h"
#include "mozilla/Attributes.h" #include "mozilla/Attributes.h"
#include "Units.h"
// X.h defines KeyPress // X.h defines KeyPress
#ifdef KeyPress #ifdef KeyPress
@ -532,9 +531,9 @@ public:
/** /**
* Indicate that the popup associated with aView has been resized to the * Indicate that the popup associated with aView has been resized to the
* given device pixel size aSize. * specified screen width and height.
*/ */
void PopupResized(nsIFrame* aFrame, mozilla::LayoutDeviceIntSize aSize); void PopupResized(nsIFrame* aFrame, nsIntSize ASize);
/** /**
* Called when a popup frame is destroyed. In this case, just remove the * Called when a popup frame is destroyed. In this case, just remove the

2
view/nsView.cpp
View File

@ -999,7 +999,7 @@ nsView::WindowResized(nsIWidget* aWidget, int32_t aWidth, int32_t aHeight)
else if (IsPopupWidget(aWidget)) { else if (IsPopupWidget(aWidget)) {
nsXULPopupManager* pm = nsXULPopupManager::GetInstance(); nsXULPopupManager* pm = nsXULPopupManager::GetInstance();
if (pm) { if (pm) {
pm->PopupResized(mFrame, LayoutDeviceIntSize(aWidth, aHeight)); pm->PopupResized(mFrame, nsIntSize(aWidth, aHeight));
return true; return true;
} }
} }