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

Side by Side Diff: Source/core/rendering/RenderObject.cpp

Issue 359603002: *** NOT FOR LANDING *** Remove StyleEngine.h include from RenderObject.h (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@final-step
Patch Set: Created 6 years, 6 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/rendering/RenderObject.h ('k') | Source/core/rendering/RootInlineBox.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) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 13 matching lines...) Expand all
24 * 24 *
25 */ 25 */
26 26
27 #include "config.h" 27 #include "config.h"
28 #include "core/rendering/RenderObject.h" 28 #include "core/rendering/RenderObject.h"
29 29
30 #include "core/HTMLNames.h" 30 #include "core/HTMLNames.h"
31 #include "core/accessibility/AXObjectCache.h" 31 #include "core/accessibility/AXObjectCache.h"
32 #include "core/css/resolver/StyleResolver.h" 32 #include "core/css/resolver/StyleResolver.h"
33 #include "core/dom/ElementTraversal.h" 33 #include "core/dom/ElementTraversal.h"
34 #include "core/dom/StyleEngine.h"
34 #include "core/dom/shadow/ShadowRoot.h" 35 #include "core/dom/shadow/ShadowRoot.h"
35 #include "core/editing/EditingBoundary.h" 36 #include "core/editing/EditingBoundary.h"
36 #include "core/editing/FrameSelection.h" 37 #include "core/editing/FrameSelection.h"
37 #include "core/editing/htmlediting.h" 38 #include "core/editing/htmlediting.h"
38 #include "core/fetch/ResourceLoadPriorityOptimizer.h" 39 #include "core/fetch/ResourceLoadPriorityOptimizer.h"
39 #include "core/fetch/ResourceLoader.h" 40 #include "core/fetch/ResourceLoader.h"
40 #include "core/frame/FrameView.h" 41 #include "core/frame/FrameView.h"
41 #include "core/frame/LocalFrame.h" 42 #include "core/frame/LocalFrame.h"
42 #include "core/html/HTMLAnchorElement.h" 43 #include "core/html/HTMLAnchorElement.h"
43 #include "core/html/HTMLElement.h" 44 #include "core/html/HTMLElement.h"
(...skipping 1363 matching lines...) Expand 10 before | Expand all | Expand 10 after
1407 1408
1408 LayoutRect RenderObject::paintingRootRect(LayoutRect& topLevelRect) 1409 LayoutRect RenderObject::paintingRootRect(LayoutRect& topLevelRect)
1409 { 1410 {
1410 LayoutRect result = absoluteBoundingBoxRect(); 1411 LayoutRect result = absoluteBoundingBoxRect();
1411 topLevelRect = result; 1412 topLevelRect = result;
1412 for (RenderObject* current = slowFirstChild(); current; current = current->n extSibling()) 1413 for (RenderObject* current = slowFirstChild(); current; current = current->n extSibling())
1413 current->addAbsoluteRectForLayer(result); 1414 current->addAbsoluteRectForLayer(result);
1414 return result; 1415 return result;
1415 } 1416 }
1416 1417
1418 RenderStyle* RenderObject::firstLineStyle() const
1419 {
1420 return document().styleEngine()->usesFirstLineRules() ? cachedFirstLineStyle () : style();
1421 }
1422
1423 RenderStyle* RenderObject::style(bool firstLine) const
1424 {
1425 return firstLine ? firstLineStyle() : style();
1426 }
1427
1417 void RenderObject::paint(PaintInfo&, const LayoutPoint&) 1428 void RenderObject::paint(PaintInfo&, const LayoutPoint&)
1418 { 1429 {
1419 } 1430 }
1420 1431
1421 const RenderLayerModelObject* RenderObject::containerForPaintInvalidation() cons t 1432 const RenderLayerModelObject* RenderObject::containerForPaintInvalidation() cons t
1422 { 1433 {
1423 if (!isRooted()) 1434 if (!isRooted())
1424 return 0; 1435 return 0;
1425 1436
1426 return adjustCompositedContainerForSpecialAncestors(enclosingCompositedConta iner()); 1437 return adjustCompositedContainerForSpecialAncestors(enclosingCompositedConta iner());
(...skipping 2089 matching lines...) Expand 10 before | Expand all | Expand 10 after
3516 { 3527 {
3517 if (object1) { 3528 if (object1) {
3518 const WebCore::RenderObject* root = object1; 3529 const WebCore::RenderObject* root = object1;
3519 while (root->parent()) 3530 while (root->parent())
3520 root = root->parent(); 3531 root = root->parent();
3521 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3532 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3522 } 3533 }
3523 } 3534 }
3524 3535
3525 #endif 3536 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderObject.h ('k') | Source/core/rendering/RootInlineBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698