Merge 68004 - 2010-09-21 Cosmin Truta <ctruta@chromium.org>...

WebCore/html/HTMLImageElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google Inc. 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 162 matching lines @@
     // also heavily discussed by Hixie on bugzilla
     String alt = getAttribute(altAttr);
     // fall back to title attribute
     if (alt.isNull())
         alt = getAttribute(titleAttr);
     return alt;
 }
 
 RenderObject* HTMLImageElement::createRenderer(RenderArena* arena, RenderStyle* style)
 {
-     if (style->contentData())
+    if (style->contentData())
         return RenderObject::createObject(this, style);
 
     RenderImage* image = new (arena) RenderImage(this);
     image->setImageResource(RenderImageResource::create());
     return image;
 }
 
 void HTMLImageElement::attach()
 {
     HTMLElement::attach();
@@ skipping 200 matching lines @@
     addSubresourceURL(urls, document()->completeURL(getAttribute(usemapAttr)));
 }
 
 void HTMLImageElement::willMoveToNewOwnerDocument()
 {
     m_imageLoader.elementWillMoveToNewOwnerDocument();
     HTMLElement::willMoveToNewOwnerDocument();
 }
 
 }