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

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

Issue 721413004: Remove includes of GraphicsContextAnnotator.h (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderBlock.cpp ('k') | Source/core/rendering/RenderReplaced.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 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 12 matching lines...) Expand all
23 #include "config.h" 23 #include "config.h"
24 #include "core/rendering/RenderInline.h" 24 #include "core/rendering/RenderInline.h"
25 25
26 #include "core/dom/Fullscreen.h" 26 #include "core/dom/Fullscreen.h"
27 #include "core/dom/StyleEngine.h" 27 #include "core/dom/StyleEngine.h"
28 #include "core/page/Chrome.h" 28 #include "core/page/Chrome.h"
29 #include "core/page/Page.h" 29 #include "core/page/Page.h"
30 #include "core/paint/BoxPainter.h" 30 #include "core/paint/BoxPainter.h"
31 #include "core/paint/InlinePainter.h" 31 #include "core/paint/InlinePainter.h"
32 #include "core/paint/ObjectPainter.h" 32 #include "core/paint/ObjectPainter.h"
33 #include "core/rendering/GraphicsContextAnnotator.h"
34 #include "core/rendering/HitTestResult.h" 33 #include "core/rendering/HitTestResult.h"
35 #include "core/rendering/InlineTextBox.h" 34 #include "core/rendering/InlineTextBox.h"
36 #include "core/rendering/RenderBlock.h" 35 #include "core/rendering/RenderBlock.h"
37 #include "core/rendering/RenderFlowThread.h" 36 #include "core/rendering/RenderFlowThread.h"
38 #include "core/rendering/RenderFullScreen.h" 37 #include "core/rendering/RenderFullScreen.h"
39 #include "core/rendering/RenderGeometryMap.h" 38 #include "core/rendering/RenderGeometryMap.h"
40 #include "core/rendering/RenderLayer.h" 39 #include "core/rendering/RenderLayer.h"
41 #include "core/rendering/RenderTheme.h" 40 #include "core/rendering/RenderTheme.h"
42 #include "core/rendering/RenderView.h" 41 #include "core/rendering/RenderView.h"
43 #include "core/rendering/style/StyleInheritedData.h" 42 #include "core/rendering/style/StyleInheritedData.h"
44 #include "platform/geometry/FloatQuad.h" 43 #include "platform/geometry/FloatQuad.h"
45 #include "platform/geometry/TransformState.h" 44 #include "platform/geometry/TransformState.h"
46 #include "platform/graphics/GraphicsContext.h"
47 45
48 namespace blink { 46 namespace blink {
49 47
50 struct SameSizeAsRenderInline : public RenderBoxModelObject { 48 struct SameSizeAsRenderInline : public RenderBoxModelObject {
51 virtual ~SameSizeAsRenderInline() { } 49 virtual ~SameSizeAsRenderInline() { }
52 RenderObjectChildList m_children; 50 RenderObjectChildList m_children;
53 RenderLineBoxList m_lineBoxes; 51 RenderLineBoxList m_lineBoxes;
54 }; 52 };
55 53
56 COMPILE_ASSERT(sizeof(RenderInline) == sizeof(SameSizeAsRenderInline), RenderInl ine_should_stay_small); 54 COMPILE_ASSERT(sizeof(RenderInline) == sizeof(SameSizeAsRenderInline), RenderInl ine_should_stay_small);
(...skipping 1350 matching lines...) Expand 10 before | Expand all | Expand 10 after
1407 container = this; 1405 container = this;
1408 1406
1409 FloatPoint absPos = container->localToAbsolute(); 1407 FloatPoint absPos = container->localToAbsolute();
1410 region.bounds.setX(absPos.x() + region.bounds.x()); 1408 region.bounds.setX(absPos.x() + region.bounds.x());
1411 region.bounds.setY(absPos.y() + region.bounds.y()); 1409 region.bounds.setY(absPos.y() + region.bounds.y());
1412 1410
1413 regions.append(region); 1411 regions.append(region);
1414 } 1412 }
1415 1413
1416 } // namespace blink 1414 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBlock.cpp ('k') | Source/core/rendering/RenderReplaced.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698