| Index: third_party/WebKit/Source/core/css/resolver/StyleResolverState.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/resolver/StyleResolverState.cpp b/third_party/WebKit/Source/core/css/resolver/StyleResolverState.cpp
|
| index a7a91959bbdbb2941e4070aac06007bc40666954..5f790d539c389aab9624e269e788bcf76ea00cdc 100644
|
| --- a/third_party/WebKit/Source/core/css/resolver/StyleResolverState.cpp
|
| +++ b/third_party/WebKit/Source/core/css/resolver/StyleResolverState.cpp
|
| @@ -1,6 +1,7 @@
|
| /*
|
| * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
|
| - * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
|
| + * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple 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
|
| @@ -37,7 +38,8 @@ StyleResolverState::StyleResolverState(
|
| : m_elementContext(elementContext),
|
| m_document(document),
|
| m_style(nullptr),
|
| - // TODO(jchaffraix): We should make m_parentStyle const (https://crbug.com/468152)
|
| + // TODO(jchaffraix): We should make m_parentStyle const
|
| + // (https://crbug.com/468152)
|
| m_parentStyle(const_cast<ComputedStyle*>(parentStyle)),
|
| m_applyPropertyToRegularStyle(true),
|
| m_applyPropertyToVisitedLinkStyle(false),
|
| @@ -45,7 +47,8 @@ StyleResolverState::StyleResolverState(
|
| m_fontBuilder(document),
|
| m_elementStyleResources(document, document.devicePixelRatio()) {
|
| if (!m_parentStyle) {
|
| - // TODO(jchaffraix): We should make m_parentStyle const (https://crbug.com/468152)
|
| + // TODO(jchaffraix): We should make m_parentStyle const
|
| + // (https://crbug.com/468152)
|
| m_parentStyle = const_cast<ComputedStyle*>(m_elementContext.parentStyle());
|
| }
|
|
|
|
|