Backed out changeset c413b946dbc4 (bug 1022612)

This commit is contained in:
Carsten "Tomcat" Book 2014-07-15 10:30:09 +02:00
parent 2fda6f0d58
commit 495422fb07
2 changed files with 4 additions and 4 deletions

View File

@ -1608,9 +1608,9 @@ AppUnitsPerDevPixel(nsDisplayItem* aItem)
* Because we only reduce the visible region here, we don't need to worry
* about whether CONTENT_OPAQUE is set; if layer was opaque in the old
* visible region, it will still be opaque in the new one.
* @param aLayerVisibleRect if non-null, the visible rect of the layer, in
* the layer's coordinate space
* @param aOuterVisibleRect the rect to restrict the visible region to, in the
* @param aLayerVisibleRegion the visible region of the layer, in the layer's
* coordinate space
* @param aRestrictToRect the rect to restrict the visible region to, in the
* parent's coordinate system
*/
static void

View File

@ -1483,7 +1483,7 @@ nsLayoutUtils::GetScrollableFrameFor(const nsIFrame *aScrolledFrame)
{
nsIFrame *frame = aScrolledFrame->GetParent();
nsIScrollableFrame *sf = do_QueryFrame(frame);
return sf && sf->GetScrolledFrame() == aScrolledFrame ? sf : nullptr;
return sf;
}
/* static */ void