Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d915962a authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24168505',...

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24168505', 'googleplex-android-review.googlesource.com/24193668'] into udc-release.

Change-Id: I04ad95aff4326de414724d438459bd5d6f7ccd63
parents e0aab277 1fd02680
Loading
Loading
Loading
Loading
+13 −1
Original line number Diff line number Diff line
@@ -813,8 +813,20 @@ void SkiaRenderEngine::drawLayersInternal(
            if (!blurInput) {
                blurInput = activeSurface->makeImageSnapshot();
            }

            // rect to be blurred in the coordinate space of blurInput
            const auto blurRect = canvas->getTotalMatrix().mapRect(bounds.rect());
            SkRect blurRect = canvas->getTotalMatrix().mapRect(bounds.rect());

            // Some layers may be much bigger than the screen. If we used
            // `blurRect` directly, this would allocate a large buffer with no
            // benefit. Apply the clip, which already takes the display size
            // into account. The clipped size will then be used to calculate the
            // size of the buffer we will create for blurring.
            if (!blurRect.intersect(SkRect::Make(canvas->getDeviceClipBounds()))) {
                // This should not happen, but if it did, we would use the full
                // sized layer, which should still be fine.
                ALOGW("blur bounds does not intersect display clip!");
            }

            // if the clip needs to be applied then apply it now and make sure
            // it is restored before we attempt to draw any shadows.
+4 −5
Original line number Diff line number Diff line
@@ -14,11 +14,10 @@

package {
    // See: http://go/android-license-faq
    // A large-scale-change added 'default_applicable_licenses' to import
    // all of the 'license_kinds' from "frameworks_native_license"
    // to get the below license kinds:
    //   SPDX-license-identifier-Apache-2.0
    default_applicable_licenses: ["frameworks_native_license"],
    default_applicable_licenses: [
        "frameworks_native_license",
        "adobe_hdr_gain_map_license",
    ],
}

cc_library {
+19 −0
Original line number Diff line number Diff line
// Copyright 2023 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//      http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

license {
    name: "adobe_hdr_gain_map_license",
    license_kinds: ["legacy_by_exception_only"],
    license_text: ["NOTICE"],
}
+1 −0
Original line number Diff line number Diff line
This product includes Gain Map technology under license by Adobe.