Mask orientation and layout correctly.

R=reed@google.com, clefru@google.com

Author: bungeman@google.com

Review URL: https://chromiumcodereview.appspot.com/14884010

git-svn-id: http://skia.googlecode.com/svn/trunk@9022 2bbb7eff-a529-9590-31e7-b0007b416f81

6 files changed, 144 insertions, 4 deletions

diff --git a/gm/deviceproperties.cpp b/gm/deviceproperties.cpp
new file mode 100644
index 0000000000..5739b57ca7
--- /dev/null
+++ b/gm/deviceproperties.cpp
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#include "gm.h"
+#include "SkTypeface.h"
+
+namespace skiagm {
+
+class DevicePropertiesGM : public GM {
+public:
+    DevicePropertiesGM() {
+        this->setBGColor(0xFFFFFFFF);
+    }
+
+    virtual ~DevicePropertiesGM() {
+    }
+
+protected:
+    virtual SkString onShortName() {
+        return SkString("deviceproperties");
+    }
+
+    virtual SkISize onISize() {
+        return make_isize(1450, 750);
+    }
+
+    static void rotate_about(SkCanvas* canvas,
+                             SkScalar degrees,
+                             SkScalar px, SkScalar py) {
+        canvas->translate(px, py);
+        canvas->rotate(degrees);
+        canvas->translate(-px, -py);
+    }
+
+    virtual void onDraw(SkCanvas* originalCanvas) {
+        SkISize size = this->getISize();
+        SkBitmap bitmap;
+        bitmap.setConfig(SkBitmap::kARGB_8888_Config, size.width(), size.height());
+        bitmap.allocPixels();
+        SkDeviceProperties properties = SkDeviceProperties::Make(
+            SkDeviceProperties::Geometry::Make(SkDeviceProperties::Geometry::kVertical_Orientation,
+                                               SkDeviceProperties::Geometry::kBGR_Layout),
+            SK_Scalar1);
+        SkDevice device(bitmap, properties);
+        SkCanvas canvas(&device);
+        canvas.drawColor(SK_ColorWHITE);
+
+        SkPaint paint;
+
+        paint.setAntiAlias(true);
+        paint.setLCDRenderText(true);
+        //With freetype the default (normal hinting) can be really ugly.
+        //Most distros now set slight (vertical hinting only) in any event.
+        paint.setHinting(SkPaint::kSlight_Hinting);
+        SkSafeUnref(paint.setTypeface(SkTypeface::CreateFromName("Times Roman", SkTypeface::kNormal)));
+
+        const char* text = "Hamburgefons ooo mmm";
+        const size_t textLen = strlen(text);
+
+        for (int j = 0; j < 2; ++j) {
+            for (int i = 0; i < 6; ++i) {
+                SkScalar x = SkIntToScalar(10);
+                SkScalar y = SkIntToScalar(20);
+
+                SkAutoCanvasRestore acr(&canvas, true);
+                canvas.translate(SkIntToScalar(50 + i * 230),
+                                  SkIntToScalar(20));
+                rotate_about(&canvas, SkIntToScalar(i * 5), x, y * 10);
+
+                {
+                    SkPaint p;
+                    p.setAntiAlias(true);
+                    SkRect r;
+                    r.set(x - SkIntToScalar(3), SkIntToScalar(15),
+                          x - SkIntToScalar(1), SkIntToScalar(280));
+                    canvas.drawRect(r, p);
+                }
+
+                int index = 0;
+                for (int ps = 6; ps <= 22; ps++) {
+                    paint.setTextSize(SkIntToScalar(ps));
+                    canvas.drawText(text, textLen, x, y, paint);
+                    y += paint.getFontMetrics(NULL);
+                    index += 1;
+                }
+            }
+            canvas.translate(0, SkIntToScalar(360));
+            paint.setSubpixelText(true);
+        }
+        originalCanvas->drawBitmap(bitmap, 0, 0);
+    }
+
+#ifdef SK_BUILD_FOR_ANDROID
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        // On android, we fail due to bad gpu drivers (it seems) by adding too
+        // much to our text atlas (texture).
+        return kSkipGPU_Flag;
+    }
+#endif
+
+private:
+    typedef GM INHERITED;
+};
+
+//////////////////////////////////////////////////////////////////////////////
+
+static GM* MyFactory(void*) { return new DevicePropertiesGM; }
+static GMRegistry reg(MyFactory);
+
+}
diff --git a/gyp/gmslides.gypi b/gyp/gmslides.gypi
index 6e1c88a2b6..641ef22ef3 100644
--- a/gyp/gmslides.gypi
+++ b/gyp/gmslides.gypi
@@ -27,6 +27,7 @@
     '../gm/degeneratesegments.cpp',
     '../gm/dashcubics.cpp',
     '../gm/dashing.cpp',
+    '../gm/deviceproperties.cpp',
     '../gm/distantclip.cpp',
     '../gm/displacement.cpp',
     '../gm/drawbitmaprect.cpp',
diff --git a/include/core/SkDeviceProperties.h b/include/core/SkDeviceProperties.h
index 4382f53958..fd573f41e9 100644
--- a/include/core/SkDeviceProperties.h
+++ b/include/core/SkDeviceProperties.h
@@ -46,10 +46,10 @@ struct SkDeviceProperties {
         };
 
         Orientation getOrientation() {
-            return static_cast<Orientation>(fGeometry | kOrientationMask);
+            return static_cast<Orientation>(fGeometry & kOrientationMask);
         }
         Layout getLayout() {
-            return static_cast<Layout>(fGeometry | kLayoutMask);
+            return static_cast<Layout>(fGeometry & kLayoutMask);
         }
 
         bool isOrientationKnown() {
diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp
index d7bd118d00..4f1c44dcdb 100755
--- a/src/ports/SkFontHost_mac.cpp
+++ b/src/ports/SkFontHost_mac.cpp
@@ -1832,8 +1832,21 @@ SkScalerContext* SkTypeface_Mac::onCreateScalerContext(const SkDescriptor* desc)
 }
 
 void SkTypeface_Mac::onFilterRec(SkScalerContextRec* rec) const {
-    unsigned flagsWeDontSupport = SkScalerContext::kDevKernText_Flag |
-                                  SkScalerContext::kAutohinting_Flag;
+    if (rec->fFlags & SkScalerContext::kLCD_BGROrder_Flag ||
+        rec->fFlags & SkScalerContext::kLCD_Vertical_Flag)
+    {
+        rec->fMaskFormat = SkMask::kA8_Format;
+        // Render the glyphs as close as possible to what was requested.
+        // The above turns off subpixel rendering, but the user requested it.
+        // Normal hinting will cause the A8 masks to be generated from CoreGraphics subpixel masks.
+        // See comments below for more details.
+        rec->setHinting(SkPaint::kNormal_Hinting);
+    }
+    
+    unsigned flagsWeDontSupport = SkScalerContext::kDevKernText_Flag  |
+                                  SkScalerContext::kAutohinting_Flag  |
+                                  SkScalerContext::kLCD_BGROrder_Flag |
+                                  SkScalerContext::kLCD_Vertical_Flag;
 
     rec->fFlags &= ~flagsWeDontSupport;
 
diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp
index d1c59b3223..4d484d7f79 100755
--- a/src/ports/SkFontHost_win.cpp
+++ b/src/ports/SkFontHost_win.cpp
@@ -1639,6 +1639,13 @@ SkTypeface* SkFontHost::CreateTypefaceFromFile(const char path[]) {
 }
 
 void LogFontTypeface::onFilterRec(SkScalerContextRec* rec) const {
+    if (rec->fFlags & SkScalerContext::kLCD_BGROrder_Flag ||
+        rec->fFlags & SkScalerContext::kLCD_Vertical_Flag)
+    {
+        rec->fMaskFormat = SkMask::kA8_Format;
+        rec->fFlags |= SkScalerContext::kGenA8FromLCD_Flag;
+    }
+
     unsigned flagsWeDontSupport = SkScalerContext::kDevKernText_Flag |
                                   SkScalerContext::kAutohinting_Flag |
                                   SkScalerContext::kEmbeddedBitmapText_Flag |
diff --git a/src/ports/SkFontHost_win_dw.cpp b/src/ports/SkFontHost_win_dw.cpp
index 84319c084a..29fa09857b 100644
--- a/src/ports/SkFontHost_win_dw.cpp
+++ b/src/ports/SkFontHost_win_dw.cpp
@@ -1258,6 +1258,12 @@ SkTypeface* SkFontHost::CreateTypefaceFromFile(const char path[]) {
 }
 
 void DWriteFontTypeface::onFilterRec(SkScalerContext::Rec* rec) const {
+    if (rec->fFlags & SkScalerContext::kLCD_BGROrder_Flag ||
+        rec->fFlags & SkScalerContext::kLCD_Vertical_Flag)
+    {
+        rec->fMaskFormat = SkMask::kA8_Format;
+    }
+
     unsigned flagsWeDontSupport = SkScalerContext::kDevKernText_Flag |
                                   SkScalerContext::kAutohinting_Flag |
                                   SkScalerContext::kEmbeddedBitmapText_Flag |