Merge lp:~kdub/mir/fix-1348330 into lp:mir

[Kevin DuBois]

demo shell: detect the additional things the demo shell draws on the renderable list and avoid calling the optimized post function if they are being drawn. This avoids incorrect rendering on the android platform if "--disable-overlays false" is set. (lp: #1348330)

demo shell: detect the additional things the demo shell draws on the renderable list and avoid calling the optimized post function if they are being drawn. This avoids incorrect rendering on the android platform if "--disable-overlays false" is set. (lp: #1348330)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1714
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2319/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1206
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1212
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1194/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/841
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/841/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/842/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/129/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2319/rebuild

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

fun valgrind error
==17821== valgrind: Unrecognised instruction at address 0xaa235d.

[Daniel van Vugt (vanvugt)]

As already disapproved in previous proposals, I don't think this is a good idea. It introduces redundant decoration-specific logic which will soon need to be deleted as bug 1299977 gets fully resolved by server-side extents logic. As it will soon need to be untangled and deleted, this change increases our future maintenance burden, slowing down future work.

That said, if I don't complete the proper fix soon enough I understand I'm slowing kdub down too.

[Kevin DuBois (kdub)]

cant reproduce locally, lets see if it happens twice.

@Daniel,
I'm not particularly attached to the code, so once something better comes along lets get rid of it. It still seems like there's not a consensus/plan on how to handle some of the "desktop" compositions, so I appreciate not blocking the overlay stuff by default.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1714
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2334/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1231
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1237
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1220/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/856
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/856/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/857/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/155/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2334/rebuild

review: Needs Fixing (continuous-integration)

[Andreas Pokorny (andreas-pokorny)]

looks fine. I does not seem like something hard to remove, additionally it only touches examples..

The illegal instruction is interesting ... it relates to code that has not changed.

review: Approve

[Robert Carr (robertcarr)]

seems ok, comes with test, and unblocks stuff :)

On the other hand I think this code is only getting weirder ;)

review: Approve

[Daniel van Vugt (vanvugt)]

I still disagree with adding code we know should soon get deleted. But won't stand in the way of progress.

review: Abstain

[Kevin DuBois (kdub)]

Still havent seen locally, but I noticed that the function valgrind was complaining about was calling glGenerateMipmap, which was not part of the mock gl. Added the function, perhaps that'll avert the complaint.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1716
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2370/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1290
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1296
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1278/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/892
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/892/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/893/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/214/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2370/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1717
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2384/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1309
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1315
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1297/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/906/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/907
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/907/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/234
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/234/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2386/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11393

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2384/rebuild

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

Unpacking lxc-android-config (0.192) over (0.191) ...
dpkg: error processing archive /var/cache/apt/archives/lxc-android-config_0.192_all.deb (--unpack):
 unable to make backup link of `./lib/udev/rules.d/70-android.rules' before installing new version: Invalid cross-device link

apparently a dist-upgrade is triggered on the device, which fails. have to wait for ci resolution

[Kevin DuBois (kdub)]

This test had a failure in utopic-mediumtests-mako test suite that warranted further investigation before that test suite was disabled. We should hold this branch off until that suite is back.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1717
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2399/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1329
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1335
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1314
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/921
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/921/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/922
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/922/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/251
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/251/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2398
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11468

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2399/rebuild

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

> This test had a failure in utopic-mediumtests-mako test suite that warranted
> further investigation before that test suite was disabled. We should hold this
> branch off until that suite is back.

The suite is re-enabled and the ci passed.

[Alan Griffiths (alan-griffiths)]

I'm not particularly convinced by this approach but I see no point in keeping this branch hanging around. At the very least the existence of the test will flag the need to write a replacement if/when the code dies.

I'm top-approving based on the existing votes

=== modified file 'examples/demo-shell/CMakeLists.txt'
--- examples/demo-shell/CMakeLists.txt	2014-07-24 18:48:23 +0000
+++ examples/demo-shell/CMakeLists.txt	2014-08-13 12:22:03 +0000
@@ -1,5 +1,4 @@
-add_executable(mir_demo_server_shell
-  demo_shell.cpp
+add_library(demo-shell STATIC
   demo_compositor.cpp
   demo_renderer.cpp
   fullscreen_placement_strategy.cpp
@@ -7,7 +6,12 @@
   ../server_configuration.cpp
 )
 
+add_executable(mir_demo_server_shell
+  demo_shell.cpp
+)
+
 target_link_libraries(mir_demo_server_shell
+  demo-shell
   mirserver
 )
 

=== modified file 'examples/demo-shell/demo_compositor.cpp'
--- examples/demo-shell/demo_compositor.cpp	2014-07-24 18:48:23 +0000
+++ examples/demo-shell/demo_compositor.cpp	2014-08-13 12:22:03 +0000
@@ -47,20 +47,27 @@
     renderer(
         factory,
         display_buffer.view_area(),
-        destination_alpha(display_buffer))
+        destination_alpha(display_buffer),
+        30.0f, //titlebar_height
+        80.0f) //shadow_radius
 {
 }
 
-mg::RenderableList me::DemoCompositor::generate_renderables()
+void me::DemoCompositor::composite()
 {
+    report->began_frame(this);
     //a simple filtering out of renderables that shouldn't be drawn
     //the elements should be notified if they are rendered or not
+    bool nonrenderlist_elements{false};
     mg::RenderableList renderable_list;
     auto elements = scene->scene_elements_for(this);
     for(auto const& it : elements)
     {
-        auto const& renderable = it->renderable(); 
-        if (renderable->visible())
+        auto const& renderable = it->renderable();
+        auto const& view_area = display_buffer.view_area();
+        auto embellished = renderer.would_embellish(*renderable, view_area);
+        auto any_part_drawn = (view_area.overlaps(renderable->screen_position()) || embellished);
+        if (renderable->visible() && any_part_drawn)
         {
             renderable_list.push_back(renderable);
             it->rendered_in(this);
@@ -69,15 +76,11 @@
         {
             it->occluded_in(this);
         }
+        nonrenderlist_elements |= embellished;
     }
-    return renderable_list;
-}
 
-void me::DemoCompositor::composite()
-{
-    report->began_frame(this);
-    auto const& renderable_list = generate_renderables();
-    if (display_buffer.post_renderables_if_optimizable(renderable_list))
+    if (!nonrenderlist_elements &&
+        display_buffer.post_renderables_if_optimizable(renderable_list))
     {
         renderer.suspend();
         report->finished_frame(true, this);

=== modified file 'examples/demo-shell/demo_compositor.h'
--- examples/demo-shell/demo_compositor.h	2014-07-24 18:35:02 +0000
+++ examples/demo-shell/demo_compositor.h	2014-08-13 12:22:03 +0000
@@ -50,7 +50,6 @@
     void composite() override;
 
 private:
-    graphics::RenderableList generate_renderables();
     graphics::DisplayBuffer& display_buffer;
     std::shared_ptr<compositor::Scene> const scene;
     std::shared_ptr<compositor::CompositorReport> const report;

=== modified file 'examples/demo-shell/demo_renderer.cpp'
--- examples/demo-shell/demo_renderer.cpp	2014-08-05 11:34:22 +0000
+++ examples/demo-shell/demo_renderer.cpp	2014-08-13 12:22:03 +0000
@@ -24,6 +24,7 @@
 
 using namespace mir;
 using namespace mir::examples;
+using namespace mir::geometry;
 
 namespace
 {
@@ -76,7 +77,7 @@
     return corner;
 }
 
-GLuint generate_frame_corner_texture(float corner_radius,
+GLuint generate_frame_corner_texture(int corner_radius,
                                      Color const& color,
                                      GLubyte highlight)
 {
@@ -138,13 +139,17 @@
 
 DemoRenderer::DemoRenderer(
     graphics::GLProgramFactory const& program_factory,
-    geometry::Rectangle const& display_area,
-    compositor::DestinationAlpha dest_alpha)
-    : GLRenderer(program_factory,
+    Rectangle const& display_area,
+    compositor::DestinationAlpha dest_alpha,
+    float const titlebar_height,
+    float const shadow_radius) :
+    GLRenderer(program_factory,
         std::unique_ptr<graphics::GLTextureCache>(new compositor::RecentlyUsedCache()),
         display_area,
-        dest_alpha)
-    , corner_radius(0.5f)
+        dest_alpha),
+    titlebar_height{titlebar_height},
+    shadow_radius{shadow_radius},
+    corner_radius{0.5f}
 {
     shadow_corner_tex = generate_shadow_corner_texture(0.4f);
     titlebar_corner_tex = generate_frame_corner_texture(corner_radius,
@@ -177,8 +182,8 @@
                               graphics::Renderable const& renderable) const
 {
     GLRenderer::tessellate(primitives, renderable);
-    tessellate_shadow(primitives, renderable, 80.0f);
-    tessellate_frame(primitives, renderable, 30.0f);
+    tessellate_shadow(primitives, renderable, shadow_radius);
+    tessellate_frame(primitives, renderable, titlebar_height);
 }
 
 void DemoRenderer::tessellate_shadow(std::vector<graphics::GLPrimitive>& primitives,
@@ -303,3 +308,30 @@
     titlebar.vertices[3] = {{inleft,  top,  0.0f}, {1.0f, 1.0f}};
 }
 
+bool DemoRenderer::would_embellish(
+    graphics::Renderable const& renderable,
+    Rectangle const& display_area) const
+{
+    auto const& window = renderable.screen_position();
+    Height const full_height{2*shadow_radius + titlebar_height + window.size.height.as_int()}; 
+    Width const side_trim{shadow_radius};
+    Y const topmost_y{window.top_left.y.as_int() - shadow_radius - titlebar_height};
+    X const leftmost_x{window.top_left.x.as_int() - shadow_radius};
+    Rectangle const left{
+        Point{leftmost_x, topmost_y},
+        Size{side_trim, full_height}};
+    Rectangle const right{
+        Point{window.top_right().x, topmost_y},
+        Size{side_trim, full_height}};
+    Rectangle const bottom{
+        window.bottom_left(),
+        Size{window.size.width.as_int(), shadow_radius}};
+    Rectangle const top{
+        Point{window.top_left.x, topmost_y},
+        Size{window.size.width.as_int(), shadow_radius + titlebar_height}};
+
+    return (display_area.overlaps(left) ||
+            display_area.overlaps(right) ||
+            display_area.overlaps(top) ||
+            display_area.overlaps(bottom));
+}

=== modified file 'examples/demo-shell/demo_renderer.h'
--- examples/demo-shell/demo_renderer.h	2014-08-05 11:34:22 +0000
+++ examples/demo-shell/demo_renderer.h	2014-08-13 12:22:03 +0000
@@ -29,21 +29,33 @@
 class DemoRenderer : public compositor::GLRenderer
 {
 public:
-    DemoRenderer(graphics::GLProgramFactory const& factory, geometry::Rectangle const& display_area,
-        compositor::DestinationAlpha dest_alpha);
+    DemoRenderer(
+        graphics::GLProgramFactory const& factory,
+        geometry::Rectangle const& display_area,
+        compositor::DestinationAlpha dest_alpha,
+        float const titlebar_height,
+        float const shadow_radius);
     ~DemoRenderer();
 
     void begin() const override;
-    void tessellate(std::vector<graphics::GLPrimitive>& primitives,
-                    graphics::Renderable const& renderable) const override;
-    void tessellate_shadow(std::vector<graphics::GLPrimitive>& primitives,
-                    graphics::Renderable const& renderable,
-                    float radius) const;
-    void tessellate_frame(std::vector<graphics::GLPrimitive>& primitives,
-                    graphics::Renderable const& renderable,
-                    float titlebar_height) const;
+    void tessellate(
+        std::vector<graphics::GLPrimitive>& primitives,
+        graphics::Renderable const& renderable) const override;
+    void tessellate_shadow(
+        std::vector<graphics::GLPrimitive>& primitives,
+        graphics::Renderable const& renderable,
+        float radius) const;
+    void tessellate_frame(
+        std::vector<graphics::GLPrimitive>& primitives,
+        graphics::Renderable const& renderable,
+        float titlebar_height) const;
+    bool would_embellish(
+        graphics::Renderable const& renderable,
+        geometry::Rectangle const&) const;
 
 private:
+    float const titlebar_height;
+    float const shadow_radius;
     float const corner_radius;
     GLuint shadow_corner_tex;
     GLuint titlebar_corner_tex;

=== modified file 'include/test/mir_test_doubles/mock_gl.h'
--- include/test/mir_test_doubles/mock_gl.h	2014-07-02 06:29:24 +0000
+++ include/test/mir_test_doubles/mock_gl.h	2014-08-13 12:22:03 +0000
@@ -105,6 +105,7 @@
                  void(GLuint, GLint, GLenum, GLboolean, GLsizei,
                       const GLvoid *));
     MOCK_METHOD4(glViewport, void(GLint, GLint, GLsizei, GLsizei));
+    MOCK_METHOD1(glGenerateMipmap, void(GLenum target));
 };
 
 }

=== modified file 'tests/mir_test_doubles/mock_gl.cpp'
--- tests/mir_test_doubles/mock_gl.cpp	2014-07-02 06:29:24 +0000
+++ tests/mir_test_doubles/mock_gl.cpp	2014-08-13 12:22:03 +0000
@@ -415,3 +415,9 @@
     CHECK_GLOBAL_VOID_MOCK();
     global_mock_gl->glFinish();
 }
+
+void glGenerateMipmap(GLenum target)
+{
+    CHECK_GLOBAL_VOID_MOCK();
+    global_mock_gl->glGenerateMipmap(target);
+}

=== modified file 'tests/unit-tests/CMakeLists.txt'
--- tests/unit-tests/CMakeLists.txt	2014-08-04 08:58:40 +0000
+++ tests/unit-tests/CMakeLists.txt	2014-08-13 12:22:03 +0000
@@ -35,6 +35,7 @@
 add_subdirectory(android_input/)
 add_subdirectory(scene/)
 add_subdirectory(draw/)
+add_subdirectory(examples/)
 
 link_directories(${LIBRARY_OUTPUT_PATH})
 
@@ -51,6 +52,7 @@
   mirserver
   mirdraw
   mirtestdraw
+  demo-shell
 
   mir-test
   mir-test-doubles

=== added directory 'tests/unit-tests/examples'
=== added file 'tests/unit-tests/examples/CMakeLists.txt'
--- tests/unit-tests/examples/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/unit-tests/examples/CMakeLists.txt	2014-08-13 12:22:03 +0000
@@ -0,0 +1,5 @@
+list(APPEND UNIT_TEST_SOURCES
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_demo_renderer.cpp
+)
+
+set(UNIT_TEST_SOURCES ${UNIT_TEST_SOURCES} PARENT_SCOPE)

=== added file 'tests/unit-tests/examples/test_demo_renderer.cpp'
--- tests/unit-tests/examples/test_demo_renderer.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit-tests/examples/test_demo_renderer.cpp	2014-08-13 12:22:03 +0000
@@ -0,0 +1,61 @@
+/*
+ * Copyright © 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Kevin DuBois <[e-mail]>
+ */
+
+#include "mir/graphics/renderable.h"
+#include "mir/compositor/destination_alpha.h"
+#include "mir_test_doubles/fake_renderable.h"
+#include "mir_test_doubles/stub_gl_program_factory.h"
+#include "mir_test_doubles/mock_gl.h"
+#include "examples/demo-shell/demo_renderer.h"
+#include <gtest/gtest.h>
+
+namespace mtd = mir::test::doubles;
+namespace geom = mir::geometry;
+namespace me = mir::examples;
+namespace mc = mir::compositor;
+
+struct DemoRenderer : public testing::Test
+{
+    testing::NiceMock<mtd::MockGL> mock_gl;
+    mtd::StubGLProgramFactory stub_factory;
+    geom::Rectangle region{{0, 0}, {100, 100}};
+    mc::DestinationAlpha dest_alpha{mc::DestinationAlpha::opaque};
+    int const shadow_radius{20};
+    int const titlebar_height{5};
+};
+
+TEST_F(DemoRenderer, detects_embellishments_on_renderables)
+{
+    me::DemoRenderer demo_renderer(stub_factory, region, dest_alpha, titlebar_height, shadow_radius);
+
+    mtd::FakeRenderable fullscreen_surface(region);
+    mtd::FakeRenderable oversized_surface(geom::Rectangle{{-10, -10}, {120, 120}});
+    mtd::FakeRenderable top_shadow(geom::Rectangle{{0, 105}, {10, 10}});
+    mtd::FakeRenderable right_shadow(geom::Rectangle{{-10, 0}, {10, 10}});
+    mtd::FakeRenderable left_shadow(geom::Rectangle{{100, 0}, {10, 10}});
+    mtd::FakeRenderable bottom_shadow(geom::Rectangle{{-10, 0}, {10, 10}});
+    mtd::FakeRenderable only_titlebar(geom::Rectangle{{0, 5}, {100, 95}});
+
+    EXPECT_TRUE(demo_renderer.would_embellish(top_shadow, region));
+    EXPECT_TRUE(demo_renderer.would_embellish(right_shadow, region));
+    EXPECT_TRUE(demo_renderer.would_embellish(bottom_shadow, region));
+    EXPECT_TRUE(demo_renderer.would_embellish(left_shadow, region));
+    EXPECT_TRUE(demo_renderer.would_embellish(only_titlebar, region));
+    EXPECT_FALSE(demo_renderer.would_embellish(fullscreen_surface, region));
+    EXPECT_FALSE(demo_renderer.would_embellish(oversized_surface, region));
+}