!9259 Decoupling the using of display_type.h in surface

Merge pull request !9259 from hujunjian72/master

graphic/graphicnapitest/NativeBufferTest.cpp

@@ -30,7 +30,7 @@ public:
     static inline OH_NativeBuffer_Config config = {
         .width = 0x100,
         .height = 0x100,
-        .format = PIXEL_FMT_RGBA_8888,
+        .format = GRAPHIC_PIXEL_FMT_RGBA_8888,
         .usage = BUFFER_USAGE_CPU_READ | BUFFER_USAGE_CPU_WRITE | BUFFER_USAGE_MEM_DMA,
     };
     static inline OH_NativeBuffer_Config checkConfig = {};

graphic/graphicnapitest/NativeImageTest.cpp

@@ -319,7 +319,7 @@ HWTEST_F(NativeImageTest, OHNativeImageUpdateSurfaceImage003, Function | MediumT
         std::cout << "NativeWindowHandleOpt SET_STRIDE failed" << std::endl;
     }
     code = SET_FORMAT;
-    int32_t format = PIXEL_FMT_RGBA_8888;
+    int32_t format = GRAPHIC_PIXEL_FMT_RGBA_8888;
     ret = NativeWindowHandleOpt(nativeWindow, code, format);
     if (ret != GSERROR_OK) {
         std::cout << "NativeWindowHandleOpt SET_FORMAT failed" << std::endl;