提交 0c824f55 编写于 作者: N niulihua 提交者: Gitee

!31 Embrace template "Vector" in namespace "Graphic"

Merge pull request !31 from benb365/master
/huawei_proprietary tools/qt/build*
\ No newline at end of file
...@@ -59,6 +59,7 @@ inline bool RootView::IntersectScreenRect(Rect& rect) ...@@ -59,6 +59,7 @@ inline bool RootView::IntersectScreenRect(Rect& rect)
} }
#if LOCAL_RENDER #if LOCAL_RENDER
using namespace Graphic;
static void DivideInvalidateRect(const Rect& originRect, Rect& leftoverRect, Vector<Rect>& splitRects) static void DivideInvalidateRect(const Rect& originRect, Rect& leftoverRect, Vector<Rect>& splitRects)
{ {
Rect mask; Rect mask;
......
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
#ifndef GRAPHIC_LITE_ROOT_VIEW_H #ifndef GRAPHIC_LITE_ROOT_VIEW_H
#define GRAPHIC_LITE_ROOT_VIEW_H #define GRAPHIC_LITE_ROOT_VIEW_H
#include <map>
#if defined __linux__ || defined __LITEOS__ || defined __APPLE__ #if defined __linux__ || defined __LITEOS__ || defined __APPLE__
#include <pthread.h> #include <pthread.h>
#endif #endif
...@@ -46,9 +45,13 @@ ...@@ -46,9 +45,13 @@
#include "components/ui_view_group.h" #include "components/ui_view_group.h"
#include "events/key_event.h" #include "events/key_event.h"
#include "events/virtual_device_event.h" #include "events/virtual_device_event.h"
#include "gfx_utils/vector.h"
#include "gfx_utils/list.h" #include "gfx_utils/list.h"
#if LOCAL_RENDER
#include <map>
#include "gfx_utils/vector.h"
#endif
namespace OHOS { namespace OHOS {
#if ENABLE_WINDOW #if ENABLE_WINDOW
class Window; class Window;
...@@ -285,7 +288,7 @@ private: ...@@ -285,7 +288,7 @@ private:
void OptimizeInvalidView(UIView* curview, UIView* backgroud, List<Rect> &renderedRects); void OptimizeInvalidView(UIView* curview, UIView* backgroud, List<Rect> &renderedRects);
void OptimizeInvalidMap(); void OptimizeInvalidMap();
std::map<UIView*, Vector<Rect>> invalidateMap_; std::map<UIView*, Graphic::Vector<Rect>> invalidateMap_;
#else #else
bool renderFlag_ = false; bool renderFlag_ = false;
Rect invalidRect_; Rect invalidRect_;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册