[AT-SPI] Squashed implementation

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / super-blur-view / super-blur-view-impl.cpp

diff --git a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
index 1b55ce8..80714d0 100644 (file)
--- a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
+++ b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <cmath>
 #include <dali/public-api/animation/constraint.h>
-#include <dali/public-api/common/stage.h>
+#include <dali/devel-api/common/stage.h>
 #include <dali/public-api/object/property-map.h>
 #include <dali/public-api/object/type-registry.h>
 #include <dali/public-api/object/type-registry-helper.h>
@@ -35,6 +35,7 @@
 #include <dali-toolkit/internal/controls/control/control-renderers.h>
 #include <dali-toolkit/internal/visuals/visual-base-impl.h>
 #include <dali-toolkit/internal/visuals/visual-factory-impl.h>
+#include <dali-toolkit/internal/controls/control/control-data-impl.h>
 
 namespace //Unnamed namespace
 {
@@ -137,6 +138,11 @@ SuperBlurView::SuperBlurView( unsigned int blurLevels )
   mGaussianBlurView.assign( blurLevels, Toolkit::GaussianBlurView() );
   mBlurredImage.assign( blurLevels, FrameBuffer() );
   mRenderers.assign( blurLevels+1, Dali::Renderer() );
+
+  DevelControl::SetAccessibilityConstructor( Self(), []( Dali::Actor actor ) {
+    return std::unique_ptr< Dali::Accessibility::Accessible >(
+      new Control::Impl::AccessibleImpl( actor, Dali::Accessibility::Role::FILLER ) );
+  } );
 }
 
 SuperBlurView::~SuperBlurView()
@@ -294,15 +300,15 @@ void SuperBlurView::OnSizeSet( const Vector3& targetSize )
   Control::OnSizeSet( targetSize );
 }
 
-void SuperBlurView::OnStageConnection( int depth )
+void SuperBlurView::OnSceneConnection( int depth )
 {
   if( mTargetSize == Vector2::ZERO )
   {
     return;
   }
 
-  // Exception to the rule, chaining up first ensures visuals have SetOnStage called to create their renderers
-  Control::OnStageConnection( depth );
+  // Exception to the rule, chaining up first ensures visuals have SetOnScene called to create their renderers
+  Control::OnSceneConnection( depth );
 
   Actor self = Self();
 
@@ -334,7 +340,7 @@ void SuperBlurView::OnStageConnection( int depth )
   }
 }
 
-void SuperBlurView::OnStageDisconnection()
+void SuperBlurView::OnSceneDisconnection()
 {
   for(unsigned int i=0; i<mBlurLevels+1;i++)
   {
@@ -342,7 +348,7 @@ void SuperBlurView::OnStageDisconnection()
     mRenderers[i].Reset();
   }
 
-  Control::OnStageDisconnection();
+  Control::OnSceneDisconnection();
 }
 
 Vector3 SuperBlurView::GetNaturalSize()