Index: Source/core/layout/LayoutObject.cpp |
diff --git a/Source/core/layout/LayoutObject.cpp b/Source/core/layout/LayoutObject.cpp |
index e83bcaf727985ddf3cefa21f3da22497820ad565..e35fc98152e4651c6e34ba33f2363885135ab5c9 100644 |
--- a/Source/core/layout/LayoutObject.cpp |
+++ b/Source/core/layout/LayoutObject.cpp |
@@ -2324,7 +2324,8 @@ 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. |
Noel Gordon
2015/06/12 16:21:04
Comment out of date.
rwlbuis
2015/06/15 17:21:52
Done.
|
return document().isImageDocument() |
Noel Gordon
2015/06/12 16:21:04
Let's break this up into individual if statements,
rwlbuis
2015/06/15 17:21:52
Done. Forgot about the breaking up though, will fi
|
- || (document().settings() && document().settings()->shouldRespectImageOrientation() && isHTMLImageElement(node())) ? RespectImageOrientation : DoNotRespectImageOrientation; |
+ || (((document().settings() && document().settings()->shouldRespectImageOrientation()) || (style() && style()->respectImageOrientation() == RespectImageOrientation)) && isHTMLImageElement(node())) ? RespectImageOrientation : DoNotRespectImageOrientation; |
+ |
} |
LayoutObject* LayoutObject::container(const LayoutBoxModelObject* paintInvalidationContainer, bool* paintInvalidationContainerSkipped) const |