corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove apz.subframe.enabled and assume it is always true. (bug 1128761, r=kats)

Browse Source
This commit is contained in:
David Anderson
2015-02-03 15:02:04 -08:00
parent 051d4eff9d
commit cfade247e1
8 changed files with 21 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
b2g/app/b2g.js
View File

@@ -1003,7 +1003,6 @@ pref("apz.y_stationary_size_multiplier", "1.8");
pref("apz.enlarge_displayport_when_clipped", true); pref("apz.enlarge_displayport_when_clipped", true);
// Use "sticky" axis locking // Use "sticky" axis locking
pref("apz.axis_lock.mode", 2); pref("apz.axis_lock.mode", 2);
pref("apz.subframe.enabled", true);
// Overscroll-related settings // Overscroll-related settings
pref("apz.overscroll.enabled", true); pref("apz.overscroll.enabled", true);

1
browser/metro/profile/metro.js
View File

@@ -59,7 +59,6 @@ pref("apz.min_skate_speed", "10.0");
// 0 = free, 1 = standard, 2 = sticky // 0 = free, 1 = standard, 2 = sticky
pref("apz.axis_lock.mode", 2); pref("apz.axis_lock.mode", 2);
pref("apz.cross_slide.enabled", true); pref("apz.cross_slide.enabled", true);
pref("apz.subframe.enabled", true);
// Enable Microsoft TSF support by default for imes. // Enable Microsoft TSF support by default for imes.
pref("intl.tsf.enable", true); pref("intl.tsf.enable", true);

1
gfx/thebes/gfxPrefs.h
View File

@@ -173,7 +173,6 @@ private:
DECL_GFX_PREF(Live, "apz.pan_repaint_interval", APZPanRepaintInterval, int32_t, 250); DECL_GFX_PREF(Live, "apz.pan_repaint_interval", APZPanRepaintInterval, int32_t, 250);
DECL_GFX_PREF(Live, "apz.printtree", APZPrintTree, bool, false); DECL_GFX_PREF(Live, "apz.printtree", APZPrintTree, bool, false);
DECL_GFX_PREF(Live, "apz.smooth_scroll_repaint_interval", APZSmoothScrollRepaintInterval, int32_t, 75); DECL_GFX_PREF(Live, "apz.smooth_scroll_repaint_interval", APZSmoothScrollRepaintInterval, int32_t, 75);
DECL_GFX_PREF(Live, "apz.subframe.enabled", APZSubframeEnabled, bool, false);
DECL_GFX_PREF(Once, "apz.test.logging_enabled", APZTestLoggingEnabled, bool, false); DECL_GFX_PREF(Once, "apz.test.logging_enabled", APZTestLoggingEnabled, bool, false);
DECL_GFX_PREF(Live, "apz.touch_start_tolerance", APZTouchStartTolerance, float, 1.0f/4.5f); DECL_GFX_PREF(Live, "apz.touch_start_tolerance", APZTouchStartTolerance, float, 1.0f/4.5f);
DECL_GFX_PREF(Live, "apz.use_paint_duration", APZUsePaintDuration, bool, true); DECL_GFX_PREF(Live, "apz.use_paint_duration", APZUsePaintDuration, bool, true);

10
layout/base/nsLayoutUtils.cpp
View File

@@ -2892,7 +2892,8 @@ nsLayoutUtils::GetOrMaybeCreateDisplayPort(nsDisplayListBuilder& aBuilder,
// displayport. // displayport.
// Note: we only do this in processes where we do subframe scrolling to // Note: we only do this in processes where we do subframe scrolling to
// begin with (i.e., not in the parent process on B2G). // begin with (i.e., not in the parent process on B2G).
if (aBuilder.IsPaintingToWindow() && WantSubAPZC() && if (aBuilder.IsPaintingToWindow() &&
gfxPrefs::AsyncPanZoomEnabled() &&
!aBuilder.HaveScrollableDisplayPort() && !aBuilder.HaveScrollableDisplayPort() &&
scrollableFrame->WantAsyncScroll()) { scrollableFrame->WantAsyncScroll()) {
@@ -7652,13 +7653,6 @@ nsLayoutUtils::CalculateExpandedScrollableRect(nsIFrame* aFrame)
return scrollableRect; return scrollableRect;
} }
/* static */ bool
nsLayoutUtils::WantSubAPZC()
{
return gfxPrefs::AsyncPanZoomEnabled() &&
gfxPrefs::APZSubframeEnabled();
}
/* static */ bool /* static */ bool
nsLayoutUtils::UsesAsyncScrolling() nsLayoutUtils::UsesAsyncScrolling()
{ {

6
layout/base/nsLayoutUtils.h
View File

@@ -2471,12 +2471,6 @@ public:
static nsRect static nsRect
CalculateExpandedScrollableRect(nsIFrame* aFrame); CalculateExpandedScrollableRect(nsIFrame* aFrame);
/**
* Return whether we want to use APZ for subframes in this process.
* Currently we don't support APZ for the parent process on B2G.
*/
static bool WantSubAPZC();
/** /**
* Returns true if we're using asynchronous scrolling (either through * Returns true if we're using asynchronous scrolling (either through
* APZ or the android frontend). * APZ or the android frontend).

2
layout/generic/nsGfxScrollFrame.cpp
View File

@@ -3007,7 +3007,7 @@ ScrollFrameHelper::BuildDisplayList(nsDisplayListBuilder* aBuilder,
shouldBuildLayer = true; shouldBuildLayer = true;
} else { } else {
shouldBuildLayer = shouldBuildLayer =
nsLayoutUtils::WantSubAPZC() && gfxPrefs::AsyncPanZoomEnabled() &&
WantAsyncScroll() && WantAsyncScroll() &&
// If we are using containers for root frames, and we are the root // If we are using containers for root frames, and we are the root
// scroll frame for the display root, then we don't need a scroll // scroll frame for the display root, then we don't need a scroll

47
layout/reftests/async-scrolling/reftest.list
View File

@@ -1,32 +1,21 @@
pref(layout.async-containerless-scrolling.enabled,true) pref(apz.subframe.enabled,true) skip-if(!asyncPanZoom) == bg-fixed-1.html bg-fixed-1-ref.html pref(layout.async-containerless-scrolling.enabled,true) skip-if(!asyncPanZoom) == bg-fixed-1.html bg-fixed-1-ref.html
pref(layout.async-containerless-scrolling.enabled,true) pref(apz.subframe.enabled,true) skip-if(!asyncPanZoom) == bg-fixed-cover-1.html bg-fixed-cover-1-ref.html pref(layout.async-containerless-scrolling.enabled,true) skip-if(!asyncPanZoom) == bg-fixed-cover-1.html bg-fixed-cover-1-ref.html
pref(layout.async-containerless-scrolling.enabled,true) pref(apz.subframe.enabled,true) skip-if(!asyncPanZoom) == bg-fixed-cover-2.html bg-fixed-cover-2-ref.html pref(layout.async-containerless-scrolling.enabled,true) skip-if(!asyncPanZoom) == bg-fixed-cover-2.html bg-fixed-cover-2-ref.html
pref(layout.async-containerless-scrolling.enabled,true) pref(apz.subframe.enabled,true) skip-if(!asyncPanZoom) == bg-fixed-cover-3.html bg-fixed-cover-3-ref.html pref(layout.async-containerless-scrolling.enabled,true) skip-if(!asyncPanZoom) == bg-fixed-cover-3.html bg-fixed-cover-3-ref.html
pref(layout.async-containerless-scrolling.enabled,true) pref(apz.subframe.enabled,true) skip-if(!asyncPanZoom) == element-1.html element-1-ref.html pref(layout.async-containerless-scrolling.enabled,true) skip-if(!asyncPanZoom) == element-1.html element-1-ref.html
pref(layout.async-containerless-scrolling.enabled,true) pref(apz.subframe.enabled,true) pref(layers.force-active,true) skip-if(!asyncPanZoom) == iframe-1.html iframe-1-ref.html pref(layout.async-containerless-scrolling.enabled,true) pref(layers.force-active,true) skip-if(!asyncPanZoom) == iframe-1.html iframe-1-ref.html
pref(layout.async-containerless-scrolling.enabled,true) pref(apz.subframe.enabled,true) skip-if(!asyncPanZoom) == nested-1.html nested-1-ref.html pref(layout.async-containerless-scrolling.enabled,true) skip-if(!asyncPanZoom) == nested-1.html nested-1-ref.html
pref(layout.async-containerless-scrolling.enabled,true) pref(apz.subframe.enabled,true) skip-if(!asyncPanZoom) == position-fixed-1.html position-fixed-1-ref.html pref(layout.async-containerless-scrolling.enabled,true) skip-if(!asyncPanZoom) == position-fixed-1.html position-fixed-1-ref.html
pref(layout.async-containerless-scrolling.enabled,true) pref(apz.subframe.enabled,true) skip-if(!asyncPanZoom) == position-fixed-2.html position-fixed-2-ref.html pref(layout.async-containerless-scrolling.enabled,true) skip-if(!asyncPanZoom) == position-fixed-2.html position-fixed-2-ref.html
pref(layout.async-containerless-scrolling.enabled,true) pref(apz.subframe.enabled,true) skip-if(!asyncPanZoom) == position-fixed-cover-1.html position-fixed-cover-1-ref.html pref(layout.async-containerless-scrolling.enabled,true) skip-if(!asyncPanZoom) == position-fixed-cover-1.html position-fixed-cover-1-ref.html
pref(layout.async-containerless-scrolling.enabled,true) pref(apz.subframe.enabled,true) skip-if(!asyncPanZoom) == position-fixed-cover-2.html position-fixed-cover-2-ref.html pref(layout.async-containerless-scrolling.enabled,true) skip-if(!asyncPanZoom) == position-fixed-cover-2.html position-fixed-cover-2-ref.html
pref(layout.async-containerless-scrolling.enabled,true) pref(apz.subframe.enabled,true) skip-if(!asyncPanZoom) == position-fixed-cover-3.html position-fixed-cover-3-ref.html pref(layout.async-containerless-scrolling.enabled,true) skip-if(!asyncPanZoom) == position-fixed-cover-3.html position-fixed-cover-3-ref.html
pref(layout.async-containerless-scrolling.enabled,true) pref(apz.subframe.enabled,true) skip-if(!asyncPanZoom) == split-layers-1.html split-layers-1-ref.html pref(layout.async-containerless-scrolling.enabled,true) skip-if(!asyncPanZoom) == split-layers-1.html split-layers-1-ref.html
pref(layout.async-containerless-scrolling.enabled,true) pref(apz.subframe.enabled,true) skip-if(!asyncPanZoom) == split-layers-multi-scrolling-1.html split-layers-multi-scrolling-1-ref.html pref(layout.async-containerless-scrolling.enabled,true) skip-if(!asyncPanZoom) == split-layers-multi-scrolling-1.html split-layers-multi-scrolling-1-ref.html
fails pref(layout.async-containerless-scrolling.enabled,true) pref(apz.subframe.enabled,true) skip-if(!asyncPanZoom) == split-opacity-layers-1.html split-opacity-layers-1-ref.html fails pref(layout.async-containerless-scrolling.enabled,true) skip-if(!asyncPanZoom) == split-opacity-layers-1.html split-opacity-layers-1-ref.html
pref(layout.async-containerless-scrolling.enabled,true) pref(apz.subframe.enabled,true) skip-if(!asyncPanZoom) == sticky-pos-scrollable-1.html sticky-pos-scrollable-1-ref.html pref(layout.async-containerless-scrolling.enabled,true) skip-if(!asyncPanZoom) == sticky-pos-scrollable-1.html sticky-pos-scrollable-1-ref.html
pref(layout.async-containerless-scrolling.enabled,true) pref(apz.subframe.enabled,true) skip-if(!asyncPanZoom) == fixed-pos-scrollable-1.html fixed-pos-scrollable-1-ref.html pref(layout.async-containerless-scrolling.enabled,true) skip-if(!asyncPanZoom) == fixed-pos-scrollable-1.html fixed-pos-scrollable-1-ref.html
pref(layout.async-containerless-scrolling.enabled,true) pref(apz.subframe.enabled,true) skip-if(!asyncPanZoom) == culling-1.html culling-1-ref.html pref(layout.async-containerless-scrolling.enabled,true) skip-if(!asyncPanZoom) == culling-1.html culling-1-ref.html
pref(layout.async-containerless-scrolling.enabled,false) skip-if(!asyncPanZoom) == bg-fixed-1.html bg-fixed-1-ref.html
pref(layout.async-containerless-scrolling.enabled,false) skip-if(!asyncPanZoom) == bg-fixed-cover-1.html bg-fixed-cover-1-ref.html
pref(layout.async-containerless-scrolling.enabled,false) skip-if(!asyncPanZoom) == bg-fixed-cover-2.html bg-fixed-cover-2-ref.html
pref(layout.async-containerless-scrolling.enabled,false) skip-if(!asyncPanZoom) == bg-fixed-cover-3.html bg-fixed-cover-3-ref.html
pref(layout.async-containerless-scrolling.enabled,false) skip-if(!asyncPanZoom) == element-1.html element-1-ref.html
pref(layout.async-containerless-scrolling.enabled,false) skip-if(!asyncPanZoom) == position-fixed-1.html position-fixed-1-ref.html
pref(layout.async-containerless-scrolling.enabled,false) skip-if(!asyncPanZoom) == position-fixed-2.html position-fixed-2-ref.html
pref(layout.async-containerless-scrolling.enabled,false) skip-if(!asyncPanZoom) == position-fixed-cover-1.html position-fixed-cover-1-ref.html
pref(layout.async-containerless-scrolling.enabled,false) skip-if(!asyncPanZoom) == position-fixed-cover-2.html position-fixed-cover-2-ref.html
pref(layout.async-containerless-scrolling.enabled,false) skip-if(!asyncPanZoom) == position-fixed-cover-3.html position-fixed-cover-3-ref.html
# for the following tests, we want to disable the low-precision buffer # for the following tests, we want to disable the low-precision buffer
# as it will expand the displayport beyond what the test specifies in # as it will expand the displayport beyond what the test specifies in

3
modules/libpref/init/all.js
View File

@@ -549,15 +549,12 @@ pref("apz.y_stationary_size_multiplier", "3.5");
pref("apz.zoom_animation_duration_ms", 250); pref("apz.zoom_animation_duration_ms", 250);
#ifdef XP_MACOSX #ifdef XP_MACOSX
// Layerize scrollable subframes to allow async panning
pref("apz.subframe.enabled", true);
pref("apz.fling_repaint_interval", 16); pref("apz.fling_repaint_interval", 16);
pref("apz.smooth_scroll_repaint_interval", 16); pref("apz.smooth_scroll_repaint_interval", 16);
pref("apz.pan_repaint_interval", 16); pref("apz.pan_repaint_interval", 16);
pref("apz.x_skate_size_multiplier", "2.5"); pref("apz.x_skate_size_multiplier", "2.5");
pref("apz.y_skate_size_multiplier", "3.5"); pref("apz.y_skate_size_multiplier", "3.5");
#else #else
pref("apz.subframe.enabled", false);
pref("apz.fling_repaint_interval", 75); pref("apz.fling_repaint_interval", 75);
pref("apz.smooth_scroll_repaint_interval", 75); pref("apz.smooth_scroll_repaint_interval", 75);
pref("apz.pan_repaint_interval", 250); pref("apz.pan_repaint_interval", 250);