summaryrefslogtreecommitdiff
path: root/core/src/fxge/skia
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-06-11 12:05:04 -0700
committerTom Sepez <tsepez@chromium.org>2015-06-11 12:05:04 -0700
commit677b8fffb0c76c009ad808ed91a27738e5420254 (patch)
tree3cf9937569b7ca0cb93b6dfd04ac854f414f9d36 /core/src/fxge/skia
parent2b5e0d5b20654d116045484868c9e015ed698124 (diff)
downloadpdfium-677b8fffb0c76c009ad808ed91a27738e5420254.tar.xz
Kill FXSYS_mem{cpy,cmp,set.move}{32,8}.
At one point in time, it may have made sense to indicate the expected alignment of the memory you're about to copy, but that was last century. The compiler will take care of it just fine. I stopped short of removing the FXSYS_ wrapper macros entirely. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1179693003.
Diffstat (limited to 'core/src/fxge/skia')
-rw-r--r--core/src/fxge/skia/fx_skia_blitter_new.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/core/src/fxge/skia/fx_skia_blitter_new.cpp b/core/src/fxge/skia/fx_skia_blitter_new.cpp
index bcb50b9e95..e87092f90f 100644
--- a/core/src/fxge/skia/fx_skia_blitter_new.cpp
+++ b/core/src/fxge/skia/fx_skia_blitter_new.cpp
@@ -155,7 +155,7 @@
if (col_end < col_start) return; // do nothing.
dest_scan += col_start;
if (cover_scan == 255 && m_Alpha == 255) {
- FXSYS_memset32(dest_scan, FXARGB_MAKE(m_Gray, m_Gray, m_Gray, m_Gray), col_end - col_start);
+ FXSYS_memset(dest_scan, FXARGB_MAKE(m_Gray, m_Gray, m_Gray, m_Gray), col_end - col_start);
return;
}
int src_alpha = m_Alpha * cover_scan / 255;
@@ -179,7 +179,7 @@
dest_scan += col_start;
ori_scan += col_start;
if (m_Alpha == 255 && cover_scan == 255) {
- FXSYS_memset32(dest_scan, FXARGB_MAKE(m_Gray, m_Gray, m_Gray, m_Gray), col_end - col_start);
+ FXSYS_memset(dest_scan, FXARGB_MAKE(m_Gray, m_Gray, m_Gray, m_Gray), col_end - col_start);
} else {
int src_alpha = m_Alpha;
#if 1
@@ -306,14 +306,14 @@
if (col_end < col_start) return; // do nothing.
dest_scan += col_start<<2;
if (m_Alpha == 255 && cover_scan == 255) {
- FXSYS_memset32(dest_scan, m_Color, (col_end - col_start)<<2);
+ FXSYS_memset(dest_scan, m_Color, (col_end - col_start)<<2);
return;
}
int src_alpha;
#if 0
if (m_bFullCover) {
if (m_Alpha == 255) {
- FXSYS_memset32(dest_scan, m_Color, (col_end - col_start)<<2);
+ FXSYS_memset(dest_scan, m_Color, (col_end - col_start)<<2);
return;
}
}
@@ -358,12 +358,12 @@
//ori_scan += col_start << 2;
if (m_Alpha == 255 && cover_scan == 255){
- FXSYS_memset32(dest_scan, m_Color, (col_end - col_start)<<2);
+ FXSYS_memset(dest_scan, m_Color, (col_end - col_start)<<2);
return;
}
if (cover_scan == 255) {
int dst_color = (0x00ffffff&m_Color)|(m_Alpha<<24);
- FXSYS_memset32(dest_scan, dst_color, (col_end - col_start)<<2);
+ FXSYS_memset(dest_scan, dst_color, (col_end - col_start)<<2);
return;
}
// Do not need origin bitmap, because of merge in pure transparent background
@@ -568,7 +568,7 @@
if (col_end < col_start) return; // do nothing.
dest_scan += (col_start << 2);
if (m_Alpha == 255 && cover_scan == 255) {
- FXSYS_memset32(dest_scan, m_Color, (col_end - col_start)<<2);
+ FXSYS_memset(dest_scan, m_Color, (col_end - col_start)<<2);
return;
}
int src_alpha;
@@ -601,7 +601,7 @@
dest_scan += col_start << 2;
ori_scan += col_start << 2;
if (m_Alpha == 255 && cover_scan == 255) {
- FXSYS_memset32(dest_scan, m_Color, (col_end - col_start)<<2);
+ FXSYS_memset(dest_scan, m_Color, (col_end - col_start)<<2);
return;
}
int src_alpha = m_Alpha;
@@ -1528,7 +1528,7 @@
if (result > 0) {
dest_pos = dest_scan + col_start;
if (result >= 4)
- FXSYS_memset32(dest_pos, FXARGB_MAKE(aa, aa, aa, aa),result);
+ FXSYS_memset(dest_pos, FXARGB_MAKE(aa, aa, aa, aa),result);
else
FXSYS_memset(dest_pos,aa,result);
}
@@ -1554,7 +1554,7 @@
if (result > 0) {
uint8_t* dest_pos = dest_scan + col_start;
if (result >= 4)
- FXSYS_memset32(dest_pos, 0xffffffff,result);
+ FXSYS_memset(dest_pos, 0xffffffff,result);
else
FXSYS_memset(dest_pos,255,result);
}