Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1039818 - Extract the implementation of nsIDOMWindowUtils::GetResolution into nsLayoutUtils. r=ehsan

Browse Source
This commit is contained in:
Botond Ballo 2015-04-10 19:33:56 -04:00
parent 7009659de8
commit 353b27bbd9
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dom/base/nsDOMWindowUtils.cpp
View File

@ -541,12 +541,7 @@ nsDOMWindowUtils::GetResolution(float* aResolution)
return NS_ERROR_FAILURE;
}
nsIScrollableFrame* sf = presShell->GetRootScrollFrameAsScrollable();
if (sf) {
*aResolution = sf->GetResolution();
} else {
*aResolution = presShell->GetResolution();
}
*aResolution = nsLayoutUtils::GetResolution(presShell);
return NS_OK;
}

10
layout/base/nsLayoutUtils.cpp
View File

@ -7989,6 +7989,16 @@ nsLayoutUtils::HasDocumentLevelListenersForApzAwareEvents(nsIPresShell* aShell)
return false;
}
/* static */ float
nsLayoutUtils::GetResolution(nsIPresShell* aPresShell)
{
nsIScrollableFrame* sf = aPresShell->GetRootScrollFrameAsScrollable();
if (sf) {
return sf->GetResolution();
}
return aPresShell->GetResolution();
}
/* static */ uint32_t
nsLayoutUtils::GetTouchActionFromFrame(nsIFrame* aFrame)
{

6
layout/base/nsLayoutUtils.h
View File

@ -2577,6 +2577,12 @@ public:
static bool HasApzAwareListeners(mozilla::EventListenerManager* aElm);
static bool HasDocumentLevelListenersForApzAwareEvents(nsIPresShell* aShell);
/**
* Get the resolution at which rescalable web content is drawn
* (see nsIDOMWindowUtils.getResolution).
*/
static float GetResolution(nsIPresShell* aPresShell);
private:
static uint32_t sFontSizeInflationEmPerLine;
static uint32_t sFontSizeInflationMinTwips;