Revert "hide hinting and flag enums with PAINT_FLAGS"
This reverts commit 5d052dac3ac19e6ddff8b004541310241a4e70e5.
Reason for revert: BREAKS CHROMIUM ROLL.
https://cs.chromium.org/chromium/src/third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc?l=49
| FAILED: obj/third_party/blink/renderer/platform/platform/font_platform_data_win.obj
| ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(49,29):
| error: no member named 'kLCDRenderText_Flag' in 'SkPaint'
| if (text_flags & SkPaint::kLCDRenderText_Flag) {
| ~~~~~~~~~^
| ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(51,36):
| error: no member named 'kAntiAlias_Flag' in 'SkPaint'
| } else if (text_flags & SkPaint::kAntiAlias_Flag) {
| ~~~~~~~~~^
| ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(56,52):
| error: no member named 'kSubpixelText_Flag' in 'SkPaint'
| font->setSubpixel(SkToBool(text_flags & SkPaint::kSubpixelText_Flag));
| ~~~~~~~~~^
| ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(64,29):
| error: no member named 'kAntiAlias_Flag' in 'SkPaint'
| if (text_flags & SkPaint::kAntiAlias_Flag)
| ~~~~~~~~~^
| ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(85,27):
| error: no member named 'kAntiAlias_Flag' in 'SkPaint'
| ? SkPaint::kAntiAlias_Flag
| ~~~~~~~~~^
| ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(91,35):
| error: no member named 'kLCDRenderText_Flag' in 'SkPaint'
| ? SkPaint::kLCDRenderText_Flag
| ~~~~~~~~~^
| ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(93,27):
| error: no member named 'kAntiAlias_Flag' in 'SkPaint'
| text_flags = SkPaint::kAntiAlias_Flag | lcd_flag;
| ~~~~~~~~~^
| ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(101,28):
| error: no member named 'kAntiAlias_Flag' in 'SkPaint'
| text_flags |= SkPaint::kAntiAlias_Flag;
| ~~~~~~~~~^
| 8 errors generated.
Original change's description:
> hide hinting and flag enums with PAINT_FLAGS
>
> A preflight for https://skia-review.googlesource.com/c/skia/+/185460
>
> Bug: skia:2664
> Change-Id: I83f7f9cd500e8507b559462835477ba8ae7c11ab
> Reviewed-on: https://skia-review.googlesource.com/c/185540
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Mike Reed <reed@google.com>
> Auto-Submit: Mike Reed <reed@google.com>
TBR=reed@google.com
Change-Id: I4d1581a7e29267ad459ed31d4885b823fa00066f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:2664
Reviewed-on: https://skia-review.googlesource.com/c/185680
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp
index 6d8e3b3..0f5216d 100644
--- a/tools/viewer/Viewer.cpp
+++ b/tools/viewer/Viewer.cpp
@@ -52,11 +52,6 @@
#include "NIMASlide.h"
#endif
-enum PaintFlags {
- kAntiAlias_PaintFlag = 1 << 0,
- kDither_PaintFlag = 1 << 1,
-};
-
using namespace sk_app;
static std::map<GpuPathRenderers, std::string> gPathRendererNames;
@@ -385,9 +380,9 @@
fWindow->inval();
});
fCommands.addCommand('A', "Paint", "Antialias Mode", [this]() {
- if (!(fPaintOverrides.fFlags & kAntiAlias_PaintFlag)) {
+ if (!(fPaintOverrides.fFlags & SkPaint::kAntiAlias_Flag)) {
fPaintOverrides.fAntiAlias = SkPaintFields::AntiAliasState::Alias;
- fPaintOverrides.fFlags |= kAntiAlias_PaintFlag;
+ fPaintOverrides.fFlags |= SkPaint::kAntiAlias_Flag;
fPaint.setAntiAlias(false);
gSkUseAnalyticAA = gSkForceAnalyticAA = false;
gSkUseDeltaAA = gSkForceDeltaAA = false;
@@ -423,7 +418,7 @@
break;
case SkPaintFields::AntiAliasState::DeltaAAForced:
fPaintOverrides.fAntiAlias = SkPaintFields::AntiAliasState::Alias;
- fPaintOverrides.fFlags &= ~kAntiAlias_PaintFlag;
+ fPaintOverrides.fFlags &= ~SkPaint::kAntiAlias_Flag;
gSkUseAnalyticAA = fPaintOverrides.fOriginalSkUseAnalyticAA;
gSkForceAnalyticAA = fPaintOverrides.fOriginalSkForceAnalyticAA;
gSkUseDeltaAA = fPaintOverrides.fOriginalSkUseDeltaAA;
@@ -704,7 +699,7 @@
}
SkPaintTitleUpdater paintTitle(&title);
- auto paintFlag = [this, &paintTitle](PaintFlags flag, bool (SkPaint::* isFlag)() const,
+ auto paintFlag = [this, &paintTitle](SkPaint::Flags flag, bool (SkPaint::* isFlag)() const,
const char* on, const char* off)
{
if (fPaintOverrides.fFlags & flag) {
@@ -712,8 +707,18 @@
}
};
- paintFlag(kAntiAlias_PaintFlag, &SkPaint::isAntiAlias, "Antialias", "Alias");
- paintFlag(kAntiAlias_PaintFlag, &SkPaint::isDither, "DITHER", "No Dither");
+ paintFlag(SkPaint::kAntiAlias_Flag, &SkPaint::isAntiAlias, "Antialias", "Alias");
+ paintFlag(SkPaint::kDither_Flag, &SkPaint::isDither, "DITHER", "No Dither");
+#if 0
+ paintFlag(SkPaint::kFakeBoldText_Flag, &SkPaint::isFakeBoldText, "Fake Bold", "No Fake Bold");
+ paintFlag(SkPaint::kLinearText_Flag, &SkPaint::isLinearText, "Linear Text", "Non-Linear Text");
+ paintFlag(SkPaint::kSubpixelText_Flag, &SkPaint::isSubpixelText, "Subpixel Text", "Pixel Text");
+ paintFlag(SkPaint::kLCDRenderText_Flag, &SkPaint::isLCDRenderText, "LCD", "lcd");
+ paintFlag(SkPaint::kEmbeddedBitmapText_Flag, &SkPaint::isEmbeddedBitmapText,
+ "Bitmap Text", "No Bitmap Text");
+ paintFlag(SkPaint::kAutoHinting_Flag, &SkPaint::isAutohinted,
+ "Force Autohint", "No Force Autohint");
+#endif
if (fFontOverrides.fHinting) {
switch (fFont.getHinting()) {
@@ -1045,16 +1050,39 @@
if (fFontOverrides->fHinting) {
font->writable()->setHinting(fFont->getHinting());
}
+#if 0
+ if (fFontOverrides->fFlags & SkPaint::kAntiAlias_Flag) {
+ paint->writable()->setAntiAlias(fPaint->isAntiAlias());
+ }
+ if (fFontOverrides->fFlags & SkPaint::kFakeBoldText_Flag) {
+ paint->writable()->setFakeBoldText(fPaint->isFakeBoldText());
+ }
+ if (fFontOverrides->fFlags & SkPaint::kLinearText_Flag) {
+ paint->writable()->setLinearText(fPaint->isLinearText());
+ }
+ if (fFontOverrides->fFlags & SkPaint::kSubpixelText_Flag) {
+ paint->writable()->setSubpixelText(fPaint->isSubpixelText());
+ }
+ if (fFontOverrides->fFlags & SkPaint::kLCDRenderText_Flag) {
+ paint->writable()->setLCDRenderText(fPaint->isLCDRenderText());
+ }
+ if (fFontOverrides->fFlags & SkPaint::kEmbeddedBitmapText_Flag) {
+ paint->writable()->setEmbeddedBitmapText(fPaint->isEmbeddedBitmapText());
+ }
+ if (fFontOverrides->fFlags & SkPaint::kAutoHinting_Flag) {
+ paint->writable()->setAutohinted(fPaint->isAutohinted());
+ }
+#endif
return true;
}
bool onFilter(SkTCopyOnFirstWrite<SkPaint>* paint, Type) const override {
if (*paint == nullptr) {
return true;
}
- if (fPaintOverrides->fFlags & kAntiAlias_PaintFlag) {
+ if (fPaintOverrides->fFlags & SkPaint::kAntiAlias_Flag) {
paint->writable()->setAntiAlias(fPaint->isAntiAlias());
}
- if (fPaintOverrides->fFlags & kDither_PaintFlag) {
+ if (fPaintOverrides->fFlags & SkPaint::kDither_Flag) {
paint->writable()->setDither(fPaint->isDither());
}
return true;
@@ -1618,7 +1646,7 @@
}
int aliasIdx = 0;
- if (fPaintOverrides.fFlags & kAntiAlias_PaintFlag) {
+ if (fPaintOverrides.fFlags & SkPaint::kAntiAlias_Flag) {
aliasIdx = SkTo<int>(fPaintOverrides.fAntiAlias) + 1;
}
if (ImGui::Combo("Anti-Alias", &aliasIdx,
@@ -1631,9 +1659,9 @@
gSkForceDeltaAA = fPaintOverrides.fOriginalSkForceDeltaAA;
if (aliasIdx == 0) {
fPaintOverrides.fAntiAlias = SkPaintFields::AntiAliasState::Alias;
- fPaintOverrides.fFlags &= ~kAntiAlias_PaintFlag;
+ fPaintOverrides.fFlags &= ~SkPaint::kAntiAlias_Flag;
} else {
- fPaintOverrides.fFlags |= kAntiAlias_PaintFlag;
+ fPaintOverrides.fFlags |= SkPaint::kAntiAlias_Flag;
fPaintOverrides.fAntiAlias =SkTo<SkPaintFields::AntiAliasState>(aliasIdx-1);
fPaint.setAntiAlias(aliasIdx > 1);
switch (fPaintOverrides.fAntiAlias) {
@@ -1665,7 +1693,7 @@
}
auto paintFlag = [this, ¶msChanged](const char* label, const char* items,
- PaintFlags flag,
+ SkPaint::Flags flag,
bool (SkPaint::* isFlag)() const,
void (SkPaint::* setFlag)(bool) )
{
@@ -1686,8 +1714,39 @@
paintFlag("Dither",
"Default\0No Dither\0Dither\0\0",
- kDither_PaintFlag,
+ SkPaint::kDither_Flag,
&SkPaint::isDither, &SkPaint::setDither);
+#if 0
+ paintFlag("Fake Bold Glyphs",
+ "Default\0No Fake Bold\0Fake Bold\0\0",
+ SkPaint::kFakeBoldText_Flag,
+ &SkPaint::isFakeBoldText, &SkPaint::setFakeBoldText);
+
+ paintFlag("Linear Text",
+ "Default\0No Linear Text\0Linear Text\0\0",
+ SkPaint::kLinearText_Flag,
+ &SkPaint::isLinearText, &SkPaint::setLinearText);
+
+ paintFlag("Subpixel Position Glyphs",
+ "Default\0Pixel Text\0Subpixel Text\0\0",
+ SkPaint::kSubpixelText_Flag,
+ &SkPaint::isSubpixelText, &SkPaint::setSubpixelText);
+
+ paintFlag("Subpixel Anti-Alias",
+ "Default\0lcd\0LCD\0\0",
+ SkPaint::kLCDRenderText_Flag,
+ &SkPaint::isLCDRenderText, &SkPaint::setLCDRenderText);
+
+ paintFlag("Embedded Bitmap Text",
+ "Default\0No Embedded Bitmaps\0Embedded Bitmaps\0\0",
+ SkPaint::kEmbeddedBitmapText_Flag,
+ &SkPaint::isEmbeddedBitmapText, &SkPaint::setEmbeddedBitmapText);
+
+ paintFlag("Force Auto-Hinting",
+ "Default\0No Force Auto-Hinting\0Force Auto-Hinting\0\0",
+ SkPaint::kAutoHinting_Flag,
+ &SkPaint::isAutohinted, &SkPaint::setAutohinted);
+#endif
ImGui::Checkbox("Override TextSize", &fFontOverrides.fTextSize);
if (fFontOverrides.fTextSize) {
ImGui::DragFloat2("TextRange", fFontOverrides.fTextSizeRange,