Merge css3/image/ and fast/images/ to images/

third_party/WebKit/Source/core/layout/LayoutReplaced.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 172 matching lines @@
   // width that shrinks our width will result in the height we compute here
   // having to shrink in order to preserve the aspect ratio. Because we compute
   // these values independently along each axis, the final returned size may in
   // fact not preserve the aspect ratio.
   // TODO(davve): Investigate using only the intrinsic aspect ratio here.
   FloatSize constrainedSize = intrinsicSizingInfo.size;
   if (!intrinsicSizingInfo.aspectRatio.isEmpty() &&
       !intrinsicSizingInfo.size.isEmpty() && style()->logicalWidth().isAuto() &&
       style()->logicalHeight().isAuto()) {
     // We can't multiply or divide by 'intrinsicSizingInfo.aspectRatio' here, it
-    // breaks tests, like fast/images/zoomed-img-size.html, which
+    // breaks tests, like images/zoomed-img-size.html, which
     // can only be fixed once subpixel precision is available for things like
     // intrinsicWidth/Height - which include zoom!
     constrainedSize.setWidth(LayoutBox::computeReplacedLogicalHeight() *
                              intrinsicSizingInfo.size.width() /
                              intrinsicSizingInfo.size.height());
     constrainedSize.setHeight(LayoutBox::computeReplacedLogicalWidth() *
                               intrinsicSizingInfo.size.height() /
                               intrinsicSizingInfo.size.width());
   }
   return constrainedSize;
@@ skipping 734 matching lines @@
     inlineBoxWrapper()->root().setHasSelectedChildren(state != SelectionNone);
 }
 
 void LayoutReplaced::IntrinsicSizingInfo::transpose() {
   size = size.transposedSize();
   aspectRatio = aspectRatio.transposedSize();
   std::swap(hasWidth, hasHeight);
 }
 
 }  // namespace blink