Merge "SurfaceControl: Remove setOverrideScalingMode" (419cc99a) · Commits · e / os / platform_frameworks_native

cmds/surfacereplayer/proto/src/trace.proto

+0 −5

Original line number	Diff line number	Diff line
		@@ -41,7 +41,6 @@ message SurfaceChange {
		LayerChange layer = 5;
		CropChange crop = 6;
		MatrixChange matrix = 8;
		OverrideScalingModeChange override_scaling_mode = 9;
		TransparentRegionHintChange transparent_region_hint = 10;
		LayerStackChange layer_stack = 11;
		HiddenFlagChange hidden_flag = 12;
		@@ -95,10 +94,6 @@ message MatrixChange {
		required float dtdy = 4;
		}

		message OverrideScalingModeChange {
		required int32 override_scaling_mode = 1;
		}

		message TransparentRegionHintChange {
		repeated Rectangle region = 1;
		}

cmds/surfacereplayer/replayer/Replayer.cpp

+0 −10

Original line number	Diff line number	Diff line
		@@ -387,10 +387,6 @@ status_t Replayer::doSurfaceTransaction(
		case SurfaceChange::SurfaceChangeCase::kMatrix:
		setMatrix(transaction, change.id(), change.matrix());
		break;
		case SurfaceChange::SurfaceChangeCase::kOverrideScalingMode:
		setOverrideScalingMode(transaction, change.id(),
		change.override_scaling_mode());
		break;
		case SurfaceChange::SurfaceChangeCase::kTransparentRegionHint:
		setTransparentRegionHint(transaction, change.id(),
		change.transparent_region_hint());
		@@ -525,12 +521,6 @@ void Replayer::setMatrix(SurfaceComposerClient::Transaction& t,
		t.setMatrix(mLayers[id], mc.dsdx(), mc.dtdx(), mc.dsdy(), mc.dtdy());
		}

		void Replayer::setOverrideScalingMode(SurfaceComposerClient::Transaction& t,
		layer_id id, const OverrideScalingModeChange& osmc) {
		ALOGV("Layer %d: Setting Override Scaling Mode -- mode=%d", id, osmc.override_scaling_mode());
		t.setOverrideScalingMode(mLayers[id], osmc.override_scaling_mode());
		}

		void Replayer::setTransparentRegionHint(SurfaceComposerClient::Transaction& t,
		layer_id id, const TransparentRegionHintChange& trhc) {
		ALOGV("Setting Transparent Region Hint");

cmds/surfacereplayer/replayer/Replayer.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -98,8 +98,6 @@ class Replayer {
		layer_id id, const BackgroundBlurRadiusChange& cc);
		void setMatrix(SurfaceComposerClient::Transaction& t,
		layer_id id, const MatrixChange& mc);
		void setOverrideScalingMode(SurfaceComposerClient::Transaction& t,
		layer_id id, const OverrideScalingModeChange& osmc);
		void setTransparentRegionHint(SurfaceComposerClient::Transaction& t,
		layer_id id, const TransparentRegionHintChange& trgc);
		void setLayerStack(SurfaceComposerClient::Transaction& t,

cmds/surfacereplayer/replayer/trace_creator/trace_creator.py

+0 −9

Original line number	Diff line number	Diff line
		@@ -69,7 +69,6 @@ def transaction_menu():
		print ("5. Crop Change")
		print ("6. Final Crop Change")
		print ("7. Matrix Change")
		print ("8. Override Scaling Mode Change")
		print ("9. Transparent Region Hint Change")
		print ("10. Layer Stack Change")
		print ("11. Hidden Flag Change")
		@@ -128,9 +127,6 @@ def transaction(increment):
		change.matrix.dtdx,\
		change.matrix.dsdy,\
		change.matrix.dtdy = layer()
		elif option == 8:
		change.override_scaling_mode.override_scaling_mode \
		= override_scaling_mode()
		elif option == 9:
		for rect in transparent_region_hint():
		new = increment.transparent_region_hint.region.add()
		@@ -227,11 +223,6 @@ def matrix():

		return float(dsdx)

		def override_scaling_mode():
		mode = input("Enter override scaling mode: ")

		return int(mode)

		def transparent_region_hint():
		num = input("Enter number of rectangles in region: ")

libs/gui/LayerState.cpp

+0 −7

Original line number	Diff line number	Diff line
		@@ -44,7 +44,6 @@ layer_state_t::layer_state_t()
		cornerRadius(0.0f),
		backgroundBlurRadius(0),
		barrierFrameNumber(0),
		overrideScalingMode(-1),
		transform(0),
		transformToDisplayInverse(false),
		crop(Rect::INVALID_RECT),
		@@ -86,7 +85,6 @@ status_t layer_state_t::write(Parcel& output) const
		SAFE_PARCEL(SurfaceControl::writeNullableToParcel, output, barrierSurfaceControl_legacy);
		SAFE_PARCEL(SurfaceControl::writeNullableToParcel, output, reparentSurfaceControl);
		SAFE_PARCEL(output.writeUint64, barrierFrameNumber);
		SAFE_PARCEL(output.writeInt32, overrideScalingMode);
		SAFE_PARCEL(SurfaceControl::writeNullableToParcel, output, relativeLayerSurfaceControl);
		SAFE_PARCEL(SurfaceControl::writeNullableToParcel, output, parentSurfaceControlForChild);
		SAFE_PARCEL(output.writeFloat, color.r);
		@@ -176,7 +174,6 @@ status_t layer_state_t::read(const Parcel& input)
		SAFE_PARCEL(SurfaceControl::readNullableFromParcel, input, &barrierSurfaceControl_legacy);
		SAFE_PARCEL(SurfaceControl::readNullableFromParcel, input, &reparentSurfaceControl);
		SAFE_PARCEL(input.readUint64, &barrierFrameNumber);
		SAFE_PARCEL(input.readInt32, &overrideScalingMode);

		SAFE_PARCEL(SurfaceControl::readNullableFromParcel, input, &relativeLayerSurfaceControl);
		SAFE_PARCEL(SurfaceControl::readNullableFromParcel, input, &parentSurfaceControlForChild);
		@@ -381,10 +378,6 @@ void layer_state_t::merge(const layer_state_t& other) {
		barrierSurfaceControl_legacy = other.barrierSurfaceControl_legacy;
		barrierFrameNumber = other.barrierFrameNumber;
		}
		if (other.what & eOverrideScalingModeChanged) {
		what \|= eOverrideScalingModeChanged;
		overrideScalingMode = other.overrideScalingMode;
		}
		if (other.what & eReparentChildren) {
		what \|= eReparentChildren;
		reparentSurfaceControl = other.reparentSurfaceControl;