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

Side by Side Diff: Source/core/dom/Document.cpp

Issue 47623002: Fix more warnings on linux (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix RenderImage.cpp. Created 7 years, 1 month 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/dom/DOMURLUtilsReadOnly.h ('k') | Source/core/dom/QualifiedName.cpp » ('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) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
(...skipping 1609 matching lines...) Expand 10 before | Expand all | Expand 10 after
1620 documentElementStyle = styleResolver()->styleForElement(documentElement( )); 1620 documentElementStyle = styleResolver()->styleForElement(documentElement( ));
1621 1621
1622 RefPtr<RenderStyle> bodyStyle = 0; 1622 RefPtr<RenderStyle> bodyStyle = 0;
1623 if (body()) { 1623 if (body()) {
1624 bodyStyle = body()->renderStyle(); 1624 bodyStyle = body()->renderStyle();
1625 if (!bodyStyle || body()->needsStyleRecalc() || documentElement()->needs StyleRecalc() || change == Force) 1625 if (!bodyStyle || body()->needsStyleRecalc() || documentElement()->needs StyleRecalc() || change == Force)
1626 bodyStyle = styleResolver()->styleForElement(body(), documentElement Style.get()); 1626 bodyStyle = styleResolver()->styleForElement(body(), documentElement Style.get());
1627 } 1627 }
1628 1628
1629 WritingMode rootWritingMode = documentElementStyle->writingMode(); 1629 WritingMode rootWritingMode = documentElementStyle->writingMode();
1630 bool isHorizontalWritingMode = documentElementStyle->isHorizontalWritingMode ();
1631 TextDirection rootDirection = documentElementStyle->direction(); 1630 TextDirection rootDirection = documentElementStyle->direction();
1632 1631
1633 if (!writingModeSetOnDocumentElement() && body()) { 1632 if (!writingModeSetOnDocumentElement() && body()) {
1634 rootWritingMode = bodyStyle->writingMode(); 1633 rootWritingMode = bodyStyle->writingMode();
1635 isHorizontalWritingMode = bodyStyle->isHorizontalWritingMode();
1636 } 1634 }
1637 1635
1638 if (!directionSetOnDocumentElement() && body()) 1636 if (!directionSetOnDocumentElement() && body())
1639 rootDirection = bodyStyle->direction(); 1637 rootDirection = bodyStyle->direction();
1640 1638
1641 RefPtr<RenderStyle> documentStyle = renderView->style(); 1639 RefPtr<RenderStyle> documentStyle = renderView->style();
1642 if (documentStyle->writingMode() != rootWritingMode || documentStyle->direct ion() != rootDirection) { 1640 if (documentStyle->writingMode() != rootWritingMode || documentStyle->direct ion() != rootDirection) {
1643 RefPtr<RenderStyle> newStyle = RenderStyle::clone(documentStyle.get()); 1641 RefPtr<RenderStyle> newStyle = RenderStyle::clone(documentStyle.get());
1644 newStyle->setWritingMode(rootWritingMode); 1642 newStyle->setWritingMode(rootWritingMode);
1645 newStyle->setDirection(rootDirection); 1643 newStyle->setDirection(rootDirection);
(...skipping 3634 matching lines...) Expand 10 before | Expand all | Expand 10 after
5280 void Document::modifiedStyleSheet(StyleSheet* sheet, RecalcStyleTime when, Style ResolverUpdateMode updateMode) 5278 void Document::modifiedStyleSheet(StyleSheet* sheet, RecalcStyleTime when, Style ResolverUpdateMode updateMode)
5281 { 5279 {
5282 if (!isActive()) 5280 if (!isActive())
5283 return; 5281 return;
5284 5282
5285 styleEngine()->modifiedStyleSheet(sheet); 5283 styleEngine()->modifiedStyleSheet(sheet);
5286 styleResolverChanged(when, updateMode); 5284 styleResolverChanged(when, updateMode);
5287 } 5285 }
5288 5286
5289 } // namespace WebCore 5287 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/dom/DOMURLUtilsReadOnly.h ('k') | Source/core/dom/QualifiedName.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698