| Index: third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
|
| index 21f77974b4d1972111d3706080b499877612f2c9..3b69c2db80a99456b4da64345c17b79fa22dae0f 100644
|
| --- a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
|
| +++ b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
|
| @@ -85,7 +85,7 @@
|
| #include "core/html/HTMLSlotElement.h"
|
| #include "core/inspector/InspectorInstrumentation.h"
|
| #include "core/layout/GeneratedChildren.h"
|
| -#include "core/layout/LayoutView.h"
|
| +#include "core/layout/api/LayoutViewItem.h"
|
| #include "core/style/StyleVariableData.h"
|
| #include "core/svg/SVGDocumentExtensions.h"
|
| #include "core/svg/SVGElement.h"
|
| @@ -273,8 +273,8 @@ void StyleResolver::finishAppendAuthorStyleSheets()
|
| {
|
| collectFeatures();
|
|
|
| - if (document().layoutView() && document().layoutView()->style())
|
| - document().layoutView()->style()->font().update(document().styleEngine().fontSelector());
|
| + if (!document().layoutViewItem().isNull() && document().layoutViewItem().style())
|
| + document().layoutViewItem().style()->font().update(document().styleEngine().fontSelector());
|
|
|
| m_viewportStyleResolver->collectViewportRules();
|
|
|
|
|