Add CSS image-orientation: from-image

Source/core/layout/LayoutObject.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 2274 matching lines @@
     while (object->parent() && !object->hasLayer())
         object = object->parent();
     if (object->hasLayer())
         return toLayoutBoxModelObject(object)->layer()->root()->isRootLayer();
     return false;
 }
 
 RespectImageOrientationEnum LayoutObject::shouldRespectImageOrientation() const
 {
     // Respect the image's orientation if it's being used as a full-page image or it's
-    // an <img> and the setting to respect it everywhere is set.
-    return document().isImageDocument()
-        || (document().settings() && document().settings()->shouldRespectImageOrientation() && isHTMLImageElement(node())) ? RespectImageOrientation : DoNotRespectImageOrientation;
+    // an <img> and image-orientation: from-image is set.
+    // FIXME: crbug.com/498233

[Noel Gordon, 2015/06/19 07:41:25]

// Respect the image's orientation if it's being used as a full-page image or
// it's an <img> and the setting to respect it everywhere is set or the <img>
// has image-orientation: from-image style. FIXME: crbug.com/498233

[rwlbuis, 2015/06/19 16:03:15]

Oh, missed this.... but it will be easy to fix.

[Noel Gordon, 2015/06/19 16:50:07]

Ok, let's do it next round.

+    bool respectOrientation = false;
+    if (document().isImageDocument()) {
+        respectOrientation = true;

[Noel Gordon, 2015/06/19 07:41:25]

nit: this code might read better of your preferred the early return

    if (document().isImageDocument())
        return RespectImageOrientation;

    if (!isHTMLImageElement(node())))
        return DoNotRespectImageOrientation;

    if (document().settings() &&
document().settings()->shouldRespectImageOrientation())
         ...

etc, etc.  Wanna try that?

[rwlbuis, 2015/06/19 16:03:15]

Great suggestion, I think it looks much clearer, done.

+    } else if (isHTMLImageElement(node())) {
+        if (document().settings() && document().settings()->shouldRespectImageOrientation())
+            respectOrientation = true;
+        else if (style() && style()->respectImageOrientation() == RespectImageOrientation)
+            respectOrientation = true;
+    }
+
+    return respectOrientation ? RespectImageOrientation : DoNotRespectImageOrientation;
 }
 
 LayoutObject* LayoutObject::container(const LayoutBoxModelObject* paintInvalidationContainer, bool* paintInvalidationContainerSkipped) const
 {
     if (paintInvalidationContainerSkipped)
         *paintInvalidationContainerSkipped = false;
 
     // This method is extremely similar to containingBlock(), but with a few notable
     // exceptions.
     // (1) It can be used on orphaned subtrees, i.e., it can be called safely even when
@@ skipping 962 matching lines @@
         const blink::LayoutObject* root = object1;
         while (root->parent())
             root = root->parent();
         root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
     } else {
         fprintf(stderr, "Cannot showLayoutTree. Root is (nil)\n");
     }
 }
 
 #endif