Fix top surface becomes invisible when background surface is crashed.

Fix top surface becomes invisible when surface on same layer,
such like application layer, is crashed.
To fix this issue, I refactored attaching app to layer.
Originally, window manager attached app to surface.
This patch is the backport of master branch.

Bug-AGL : SPEC-1635

Change-Id: Ie6713e669a25662e8547aa7782551ddae60c7e01
Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>

1 files changed, 0 insertions, 343 deletions

diff --git a/src/layers.cpp b/src/layers.cpp
deleted file mode 100644
index b79d2f6..0000000
--- a/src/layers.cpp
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
- * Copyright (c) 2017 TOYOTA MOTOR CORPORATION
- * Copyright (c) 2018 Konsulko Group
- *
- * 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.
- */
-
-#include <regex>
-
-#include "layers.hpp"
-#include "json_helper.hpp"
-#include "util.hpp"
-
-namespace wm
-{
-
-using json = nlohmann::json;
-
-layer::layer(nlohmann::json const &j)
-{
-    this->role = j["role"];
-    this->name = j["name"];
-    this->layer_id = j["layer_id"];
-
-    HMI_DEBUG("layer_id:%d name:%s", this->layer_id, this->name.c_str());
-}
-
-struct result<struct layer_map> to_layer_map(nlohmann::json const &j)
-{
-    try
-    {
-        layer_map stl{};
-        auto m = j["mappings"];
-
-        std::transform(std::cbegin(m), std::cend(m),
-                       std::inserter(stl.mapping, stl.mapping.end()),
-                       [](nlohmann::json const &j) {
-                           return std::pair<int, struct layer>(
-                               j.value("layer_id", -1), layer(j));
-                       });
-
-        // TODO: add sanity checks here?
-        // * check for double IDs
-        // * check for double names/roles
-
-        stl.layers.reserve(m.size());
-        std::transform(std::cbegin(stl.mapping), std::cend(stl.mapping),
-                       std::back_inserter(stl.layers),
-                       [&stl](std::pair<int, struct layer> const &k) {
-                           stl.roles.emplace_back(
-                               std::make_pair(k.second.role, k.second.layer_id));
-                           return unsigned(k.second.layer_id);
-                       });
-
-        std::sort(stl.layers.begin(), stl.layers.end());
-
-        for (auto i : stl.mapping)
-        {
-            if (i.second.name.empty())
-            {
-                return Err<struct layer_map>("Found mapping w/o name");
-            }
-            if (i.second.layer_id == -1)
-            {
-                return Err<struct layer_map>("Found invalid/unset IDs in mapping");
-            }
-        }
-
-        auto msi = j.find("main_surface");
-        if (msi != j.end())
-        {
-            stl.main_surface_name = msi->value("surface_role", "");
-            stl.main_surface = -1;
-        }
-
-        return Ok(stl);
-    }
-    catch (std::exception &e)
-    {
-        return Err<struct layer_map>(e.what());
-    }
-}
-
-optional<int>
-layer_map::get_layer_id(int surface_id)
-{
-    auto i = this->surfaces.find(surface_id);
-    if (i != this->surfaces.end())
-    {
-        return optional<int>(i->second);
-    }
-    return nullopt;
-}
-
-optional<int> layer_map::get_layer_id(std::string const &role)
-{
-    for (auto const &r : this->roles)
-    {
-        auto re = std::regex(r.first);
-        if (std::regex_match(role, re))
-        {
-            HMI_DEBUG("role %s matches layer %d", role.c_str(), r.second);
-            return optional<int>(r.second);
-        }
-    }
-    HMI_DEBUG("role %s does NOT match any layer", role.c_str());
-    return nullopt;
-}
-
-json layer::to_json() const
-{
-    auto is_full = this->rect == compositor::full_rect;
-
-    json r{};
-    if (is_full)
-    {
-        r = {{"type", "full"}};
-    }
-    else
-    {
-        r = {{"type", "rect"},
-             {"rect",
-              {{"x", this->rect.x},
-               {"y", this->rect.y},
-               {"width", this->rect.w},
-               {"height", this->rect.h}}}};
-    }
-
-    return {
-        {"name", this->name},
-        {"role", this->role},
-        {"layer_id", this->layer_id},
-        {"area", r},
-    };
-}
-
-json layer_map::to_json() const
-{
-    json j{};
-    for (auto const &i : this->mapping)
-    {
-        j.push_back(i.second.to_json());
-    }
-    return j;
-}
-
-void layer_map::setupArea(double scaling)
-{
-    compositor::rect rct;
-
-    rct = this->area2size["normal.full"];
-    this->area2size["normalfull"] = rct;
-    this->area2size["normal"] = rct;
-
-    for (auto &i : this->area2size)
-    {
-        i.second.x = static_cast<int>(scaling * i.second.x + 0.5);
-        i.second.y = static_cast<int>(scaling * i.second.y + 0.5);
-        i.second.w = static_cast<int>(scaling * i.second.w + 0.5);
-        i.second.h = static_cast<int>(scaling * i.second.h + 0.5);
-
-        HMI_DEBUG("area:%s size(after) : x:%d y:%d w:%d h:%d",
-            i.first.c_str(), i.second.x, i.second.y, i.second.w, i.second.h);
-    }
-}
-
-compositor::rect layer_map::getAreaSize(const std::string &area)
-{
-    return area2size[area];
-}
-
-int layer_map::loadAreaDb()
-{
-    HMI_DEBUG("Call");
-
-    std::string file_name(get_file_path("areas.db"));
-
-    // Load area.db
-    json_object *json_obj;
-    int ret = jh::inputJsonFilie(file_name.c_str(), &json_obj);
-    if (0 > ret)
-    {
-        HMI_DEBUG("Could not open area.db, so use default area information");
-        json_obj = json_tokener_parse(kDefaultAreaDb);
-    }
-    HMI_DEBUG("json_obj dump:%s", json_object_get_string(json_obj));
-
-    // Perse areas
-    HMI_DEBUG("Perse areas");
-    json_object *json_cfg;
-    if (!json_object_object_get_ex(json_obj, "areas", &json_cfg))
-    {
-        HMI_ERROR("Parse Error!!");
-        return -1;
-    }
-
-    int len = json_object_array_length(json_cfg);
-    HMI_DEBUG("json_cfg len:%d", len);
-    HMI_DEBUG("json_cfg dump:%s", json_object_get_string(json_cfg));
-
-    const char *area;
-    for (int i = 0; i < len; i++)
-    {
-        json_object *json_tmp = json_object_array_get_idx(json_cfg, i);
-        HMI_DEBUG("> json_tmp dump:%s", json_object_get_string(json_tmp));
-
-        area = jh::getStringFromJson(json_tmp, "name");
-        if (nullptr == area)
-        {
-            HMI_ERROR("Parse Error!!");
-            return -1;
-        }
-        HMI_DEBUG("> area:%s", area);
-
-        json_object *json_rect;
-        if (!json_object_object_get_ex(json_tmp, "rect", &json_rect))
-        {
-            HMI_ERROR("Parse Error!!");
-            return -1;
-        }
-        HMI_DEBUG("> json_rect dump:%s", json_object_get_string(json_rect));
-
-        compositor::rect area_size;
-        area_size.x = jh::getIntFromJson(json_rect, "x");
-        area_size.y = jh::getIntFromJson(json_rect, "y");
-        area_size.w = jh::getIntFromJson(json_rect, "w");
-        area_size.h = jh::getIntFromJson(json_rect, "h");
-
-        this->area2size[area] = area_size;
-    }
-
-    // Check
-    for (auto itr = this->area2size.begin();
-         itr != this->area2size.end(); ++itr)
-    {
-        HMI_DEBUG("area:%s x:%d y:%d w:%d h:%d",
-                  itr->first.c_str(), itr->second.x, itr->second.y,
-                  itr->second.w, itr->second.h);
-    }
-
-    // Release json_object
-    json_object_put(json_obj);
-
-    return 0;
-}
-
-const char* layer_map::kDefaultAreaDb = "{ \
-    \"areas\": [ \
-        { \
-            \"name\": \"fullscreen\", \
-            \"rect\": { \
-                \"x\": 0, \
-                \"y\": 0, \
-                \"w\": 1080, \
-                \"h\": 1920 \
-            } \
-        }, \
-        { \
-            \"name\": \"normal.full\", \
-            \"rect\": { \
-                \"x\": 0, \
-                \"y\": 218, \
-                \"w\": 1080, \
-                \"h\": 1488 \
-            } \
-        }, \
-        { \
-            \"name\": \"split.main\", \
-            \"rect\": { \
-                \"x\": 0, \
-                \"y\": 218, \
-                \"w\": 1080, \
-                \"h\": 744 \
-            } \
-        }, \
-        { \
-            \"name\": \"split.sub\", \
-            \"rect\": { \
-                \"x\": 0, \
-                \"y\": 962, \
-                \"w\": 1080, \
-                \"h\": 744 \
-            } \
-        }, \
-        { \
-            \"name\": \"software_keyboard\", \
-            \"rect\": { \
-                \"x\": 0, \
-                \"y\": 962, \
-                \"w\": 1080, \
-                \"h\": 744 \
-            } \
-        }, \
-        { \
-            \"name\": \"restriction.normal\", \
-            \"rect\": { \
-                \"x\": 0, \
-                \"y\": 218, \
-                \"w\": 1080, \
-                \"h\": 1488 \
-            } \
-        }, \
-        { \
-            \"name\": \"restriction.split.main\", \
-            \"rect\": { \
-                \"x\": 0, \
-                \"y\": 218, \
-                \"w\": 1080, \
-                \"h\": 744 \
-            } \
-        }, \
-        { \
-            \"name\": \"restriction.split.sub\", \
-            \"rect\": { \
-                \"x\": 0, \
-                \"y\": 962, \
-                \"w\": 1080, \
-                \"h\": 744 \
-            } \
-        }, \
-        { \
-            \"name\": \"on_screen\", \
-            \"rect\": { \
-                \"x\": 0, \
-                \"y\": 218, \
-                \"w\": 1080, \
-                \"h\": 1488 \
-            } \
-        } \
-    ] \
-}";
-
-} // namespace wm