Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(184)

Side by Side Diff: Source/core/css/resolver/StyleResolver.cpp

Issue 157553002: Remove the Pagination struct, clean up viewport scroll policy propagation. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase master Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/core/css/resolver/StyleAdjuster.cpp ('k') | Source/core/dom/Document.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after
594 594
595 RefPtr<RenderStyle> documentStyle = RenderStyle::create(); 595 RefPtr<RenderStyle> documentStyle = RenderStyle::create();
596 documentStyle->setDisplay(BLOCK); 596 documentStyle->setDisplay(BLOCK);
597 documentStyle->setRTLOrdering(document.visuallyOrdered() ? VisualOrder : Log icalOrder); 597 documentStyle->setRTLOrdering(document.visuallyOrdered() ? VisualOrder : Log icalOrder);
598 documentStyle->setZoom(frame && !document.printing() ? frame->pageZoomFactor () : 1); 598 documentStyle->setZoom(frame && !document.printing() ? frame->pageZoomFactor () : 1);
599 documentStyle->setLocale(document.contentLanguage()); 599 documentStyle->setLocale(document.contentLanguage());
600 600
601 // This overrides any -webkit-user-modify inherited from the parent iframe. 601 // This overrides any -webkit-user-modify inherited from the parent iframe.
602 documentStyle->setUserModify(document.inDesignMode() ? READ_WRITE : READ_ONL Y); 602 documentStyle->setUserModify(document.inDesignMode() ? READ_WRITE : READ_ONL Y);
603 603
604 document.setStyleDependentState(documentStyle.get()); 604 document.setupFontBuilder(documentStyle.get());
605 return documentStyle.release(); 605 return documentStyle.release();
606 } 606 }
607 607
608 // FIXME: This is duplicated with StyleAdjuster.cpp 608 // FIXME: This is duplicated with StyleAdjuster.cpp
609 // Perhaps this should move onto ElementResolveContext or even Element? 609 // Perhaps this should move onto ElementResolveContext or even Element?
610 static inline bool isAtShadowBoundary(const Element* element) 610 static inline bool isAtShadowBoundary(const Element* element)
611 { 611 {
612 if (!element) 612 if (!element)
613 return false; 613 return false;
614 ContainerNode* parentNode = element->parentNode(); 614 ContainerNode* parentNode = element->parentNode();
(...skipping 902 matching lines...) Expand 10 before | Expand all | Expand 10 after
1517 bool StyleResolver::mediaQueryAffectedByViewportChange() const 1517 bool StyleResolver::mediaQueryAffectedByViewportChange() const
1518 { 1518 {
1519 for (unsigned i = 0; i < m_viewportDependentMediaQueryResults.size(); ++i) { 1519 for (unsigned i = 0; i < m_viewportDependentMediaQueryResults.size(); ++i) {
1520 if (m_medium->eval(&m_viewportDependentMediaQueryResults[i]->m_expressio n) != m_viewportDependentMediaQueryResults[i]->m_result) 1520 if (m_medium->eval(&m_viewportDependentMediaQueryResults[i]->m_expressio n) != m_viewportDependentMediaQueryResults[i]->m_result)
1521 return true; 1521 return true;
1522 } 1522 }
1523 return false; 1523 return false;
1524 } 1524 }
1525 1525
1526 } // namespace WebCore 1526 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/resolver/StyleAdjuster.cpp ('k') | Source/core/dom/Document.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698