| Index: third_party/WebKit/Source/core/layout/LayoutImageResourceStyleImage.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutImageResourceStyleImage.cpp b/third_party/WebKit/Source/core/layout/LayoutImageResourceStyleImage.cpp
|
| index f86750bdd47d59bf7a4574747ccb7904e9e2a931..00f91b6073ce442324890ba613072b25fde82d29 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutImageResourceStyleImage.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutImageResourceStyleImage.cpp
|
| @@ -4,7 +4,8 @@
|
| * Copyright (C) 2000 Dirk Mueller <mueller@kde.org>
|
| * Copyright (C) 2006 Allan Sandfeld Jensen <kde@carewolf.com>
|
| * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
|
| - * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserved.
|
| + * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc.
|
| + * All rights reserved.
|
| * Copyright (C) 2010 Google Inc. All rights reserved.
|
| * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
|
| *
|
| @@ -60,7 +61,8 @@ void LayoutImageResourceStyleImage::shutdown() {
|
|
|
| PassRefPtr<Image> LayoutImageResourceStyleImage::image(const IntSize& size,
|
| float zoom) const {
|
| - // Generated content may trigger calls to image() while we're still pending, don't assert but gracefully exit.
|
| + // Generated content may trigger calls to image() while we're still pending,
|
| + // don't assert but gracefully exit.
|
| if (m_styleImage->isPendingImage())
|
| return nullptr;
|
| return m_styleImage->image(*m_layoutObject, size, zoom);
|
|
|