Merge branch 'devel/master' into devel/graphics

Change-Id: I074c2bb0fbb1d6775cfbadcf4f1271e177bc12c2

diff --cc dali/devel-api/adaptor-framework/accessibility-impl.cpp
index 3db97a8,826ba37..dfbaa4d
--- 1/dali/devel-api/adaptor-framework/accessibility-impl.cpp
--- 2/dali/devel-api/adaptor-framework/accessibility-impl.cpp
+++ b/dali/devel-api/adaptor-framework/accessibility-impl.cpp
@@@ -596,7 -596,7 +596,7 @@@ class NonControlAccessible : public vir
  {
  protected:
    Dali::WeakHandle<Dali::Actor> self;
--  bool        root = false;
++  bool                          root = false;
  
    Dali::Actor Self()
    {
@@@ -618,12 -618,12 +618,12 @@@ public
  
    Dali::Rect<> GetExtents(Dali::Accessibility::CoordType ctype) override
    {
--    Dali::Actor actor = Self();
--    Vector2 screenPosition          = actor.GetProperty(Actor::Property::SCREEN_POSITION).Get<Vector2>();
--    Vector3 size                    = actor.GetCurrentProperty<Vector3>(Actor::Property::SIZE) * actor.GetCurrentProperty<Vector3>(Actor::Property::WORLD_SCALE);
--    bool    positionUsesAnchorPoint = actor.GetProperty(Actor::Property::POSITION_USES_ANCHOR_POINT).Get<bool>();
--    Vector3 anchorPointOffSet       = size * (positionUsesAnchorPoint ? actor.GetCurrentProperty<Vector3>(Actor::Property::ANCHOR_POINT) : AnchorPoint::TOP_LEFT);
--    Vector2 position                = Vector2(screenPosition.x - anchorPointOffSet.x, screenPosition.y - anchorPointOffSet.y);
++    Dali::Actor actor                   = Self();
++    Vector2     screenPosition          = actor.GetProperty(Actor::Property::SCREEN_POSITION).Get<Vector2>();
++    Vector3     size                    = actor.GetCurrentProperty<Vector3>(Actor::Property::SIZE) * actor.GetCurrentProperty<Vector3>(Actor::Property::WORLD_SCALE);
++    bool        positionUsesAnchorPoint = actor.GetProperty(Actor::Property::POSITION_USES_ANCHOR_POINT).Get<bool>();
++    Vector3     anchorPointOffSet       = size * (positionUsesAnchorPoint ? actor.GetCurrentProperty<Vector3>(Actor::Property::ANCHOR_POINT) : AnchorPoint::TOP_LEFT);
++    Vector2     position                = Vector2(screenPosition.x - anchorPointOffSet.x, screenPosition.y - anchorPointOffSet.y);
  
      return {position.x, position.y, size.x, size.y};
    }

diff --cc dali/internal/accessibility/bridge/bridge-base.h
index 5088ec6,7361181..ea6c746
--- 1/dali/internal/accessibility/bridge/bridge-base.h
--- 2/dali/internal/accessibility/bridge/bridge-base.h
+++ b/dali/internal/accessibility/bridge/bridge-base.h
@@@ -143,17 -143,17 +143,18 @@@ public
      DBus::DBusInterfaceDescription& desc, const std::string& funcName, DBus::ValueOrError<RET...> (SELF::*funcPtr)(ARGS...))
    {
      if(auto self = dynamic_cast<SELF*>(this))
--      desc.addMethod<DBus::ValueOrError<RET...>(ARGS...)>(funcName,
--                                                          [=](ARGS... args) -> DBus::ValueOrError<RET...> {
--                                                            try
--                                                            {
--                                                              return (self->*funcPtr)(std::move(args)...);
--                                                            }
--                                                            catch(std::domain_error& e)
--                                                            {
--                                                              return DBus::Error{e.what()};
--                                                            }
--                                                          });
++      desc.addMethod<DBus::ValueOrError<RET...>(ARGS...)>(
++        funcName,
++        [=](ARGS... args) -> DBus::ValueOrError<RET...> {
++          try
++          {
++            return (self->*funcPtr)(std::move(args)...);
++          }
++          catch(std::domain_error& e)
++          {
++            return DBus::Error{e.what()};
++          }
++        });
    }
  
    template<typename T, typename SELF>

diff --cc dali/internal/accessibility/bridge/bridge-impl.cpp
index f510ada,216b89b..85e6dc3
--- 1/dali/internal/accessibility/bridge/bridge-impl.cpp
--- 2/dali/internal/accessibility/bridge/bridge-impl.cpp
+++ b/dali/internal/accessibility/bridge/bridge-impl.cpp
@@@ -18,12 -18,13 +18,15 @@@
  // CLASS HEADER
  
  // EXTERNAL INCLUDES
 -#include <dali/public-api/actors/layer.h>
+ #include <dali/devel-api/common/stage.h>
  #include <dali/integration-api/debug.h>
++#include <dali/public-api/actors/layer.h>
  #include <iostream>
  #include <unordered_map>
  
  // INTERNAL INCLUDES
 +#include <dali/devel-api/adaptor-framework/environment-variable.h>
++#include <dali/devel-api/adaptor-framework/window-devel.h>
  #include <dali/internal/accessibility/bridge/bridge-accessible.h>
  #include <dali/internal/accessibility/bridge/bridge-action.h>
  #include <dali/internal/accessibility/bridge/bridge-collection.h>
@@@ -33,7 -34,10 +36,8 @@@
  #include <dali/internal/accessibility/bridge/bridge-text.h>
  #include <dali/internal/accessibility/bridge/bridge-value.h>
  #include <dali/internal/accessibility/bridge/dummy-atspi.h>
+ #include <dali/internal/adaptor/common/adaptor-impl.h>
  #include <dali/internal/system/common/environment-variables.h>
 -#include <dali/devel-api/adaptor-framework/environment-variable.h>
 -#include <dali/devel-api/adaptor-framework/window-devel.h>
  
  using namespace Dali::Accessibility;
  
@@@ -403,8 -407,17 +407,17 @@@ void Bridge::EnableAutoInit(
      return;
    }
  
 -  auto rootLayer = Dali::Stage::GetCurrent().GetRootLayer();
 -  auto window = Dali::DevelWindow::Get(rootLayer);
++  auto rootLayer       = Dali::Stage::GetCurrent().GetRootLayer();
++  auto window          = Dali::DevelWindow::Get(rootLayer);
+   auto applicationName = Dali::Internal::Adaptor::Adaptor::GetApplicationPackageName();
+ 
    auto* bridge = Bridge::GetCurrentBridge();
-   bridge->AddTopLevelWindow(topLevelWindow);
+   bridge->AddTopLevelWindow(Dali::Accessibility::Accessible::Get(rootLayer, true));
    bridge->SetApplicationName(applicationName);
    bridge->Initialize();
+ 
+   if(window && window.IsVisible())
+   {
+     bridge->ApplicationShown();
+   }
  }

diff --cc dali/internal/accessibility/bridge/dummy-atspi.cpp
Simple merge

diff --cc dali/internal/imaging/common/image-loader.cpp
index f0ace20,dbf492c..8c7139d
--- 1/dali/internal/imaging/common/image-loader.cpp
--- 2/dali/internal/imaging/common/image-loader.cpp
+++ b/dali/internal/imaging/common/image-loader.cpp
@@@ -30,6 -31,6 +30,7 @@@
  #include <dali/internal/imaging/common/loader-ktx.h>
  #include <dali/internal/imaging/common/loader-png.h>
  #include <dali/internal/imaging/common/loader-wbmp.h>
++#include <dali/internal/imaging/common/loader-webp.h>
  #include <dali/internal/system/common/file-reader.h>
  
  using namespace Dali::Integration;

diff --cc dali/internal/window-system/common/window-render-surface.cpp
Simple merge