Update Chromium to branch 1650 (31.0.1650.63)

Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>

1 files changed, 5 insertions, 11 deletions

diff --git a/chromium/third_party/WebKit/Source/core/css/resolver/StyleResolverState.cpp b/chromium/third_party/WebKit/Source/core/css/resolver/StyleResolverState.cpp
index 059d57dacc3..b98a30c462b 100644
--- a/chromium/third_party/WebKit/Source/core/css/resolver/StyleResolverState.cpp
+++ b/chromium/third_party/WebKit/Source/core/css/resolver/StyleResolverState.cpp
@@ -29,21 +29,15 @@
 
 namespace WebCore {
 
-StyleResolverState::StyleResolverState(Document* document, Element* element, RenderStyle* parentStyle, RenderRegion* regionForStyling)
-    : m_regionForStyling(0)
+StyleResolverState::StyleResolverState(Document& document, Element* element, RenderStyle* parentStyle, RenderRegion* regionForStyling)
+    : m_elementContext(element ? ElementResolveContext(element) : ElementResolveContext())
+    , m_document(element ? m_elementContext.document() : document)
+    , m_regionForStyling(0)
     , m_applyPropertyToRegularStyle(true)
     , m_applyPropertyToVisitedLinkStyle(false)
     , m_lineHeightValue(0)
     , m_styleMap(*this, m_elementStyleResources)
 {
-    if (element) {
-        m_elementContext = ElementResolveContext(element);
-        m_document = m_elementContext.document();
-    } else {
-        m_elementContext = ElementResolveContext();
-        m_document = document;
-    }
-
     m_regionForStyling = regionForStyling;
 
     if (m_elementContext.resetStyleInheritance())
@@ -62,7 +56,7 @@ StyleResolverState::StyleResolverState(Document* document, Element* element, Ren
     // FIXME: StyleResolverState is never passed between documents
     // so we should be able to do this initialization at StyleResolverState
     // createion time instead of now, correct?
-    if (Page* page = document->page())
+    if (Page* page = document.page())
         m_elementStyleResources.setDeviceScaleFactor(page->deviceScaleFactor());
 }