summaryrefslogtreecommitdiff
path: root/core/fxge/skia
diff options
context:
space:
mode:
Diffstat (limited to 'core/fxge/skia')
-rw-r--r--core/fxge/skia/fx_skia_device.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp
index dd48045ce1..a1193fbe9b 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -22,13 +22,8 @@
#include "core/fxge/dib/cfx_imagerenderer.h"
#include "core/fxge/dib/cfx_imagestretcher.h"
#include "core/fxge/skia/fx_skia_device.h"
-
-#ifdef _SKIA_SUPPORT_PATHS_
-#include "core/fxge/ge/cfx_cliprgn.h"
-#endif // _SKIA_SUPPORT_PATHS_
-
+#include "third_party/base/logging.h"
#include "third_party/base/ptr_util.h"
-
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkClipOp.h"
#include "third_party/skia/include/core/SkImage.h"
@@ -41,6 +36,10 @@
#include "third_party/skia/include/effects/SkGradientShader.h"
#include "third_party/skia/include/pathops/SkPathOps.h"
+#ifdef _SKIA_SUPPORT_PATHS_
+#include "core/fxge/ge/cfx_cliprgn.h"
+#endif // _SKIA_SUPPORT_PATHS_
+
#ifdef _SKIA_SUPPORT_
#include "third_party/skia/include/core/SkColorFilter.h"
#include "third_party/skia/include/core/SkColorPriv.h"
@@ -112,7 +111,7 @@ void RgbByteOrderTransferBitmap(const CFX_RetainPtr<CFX_DIBitmap>& pBitmap,
}
}
} else {
- ASSERT(false);
+ NOTREACHED();
}
return;
}
@@ -147,7 +146,7 @@ void RgbByteOrderTransferBitmap(const CFX_RetainPtr<CFX_DIBitmap>& pBitmap,
return;
}
- ASSERT(false);
+ NOTREACHED();
}
#endif // _SKIA_SUPPORT_PATHS_