Source/core/rendering/RenderBlock.cpp - Issue 55223002: Remove rendering dependency in GraphicsContextAnnotation

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

Issue 55223002: Remove rendering dependency in GraphicsContextAnnotation (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Patch for relanding 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/rendering/GraphicsContextAnnotator.cpp ('k') | Source/core/rendering/RenderFrameSet.cpp » ('j') | no next file with comments »

OLD	NEW
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) 2007 David Smith (catfish.man@gmail.com)	4 * (C) 2007 David Smith (catfish.man@gmail.com)

5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.	5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.

6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.	6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.

7 *	7 *

8 * This library is free software; you can redistribute it and/or	8 * This library is free software; you can redistribute it and/or

9 * modify it under the terms of the GNU Library General Public	9 * modify it under the terms of the GNU Library General Public

10 * License as published by the Free Software Foundation; either	10 * License as published by the Free Software Foundation; either

(...skipping 20 matching lines...) Expand all Loading...
31 #include "core/events/OverflowEvent.h"	31 #include "core/events/OverflowEvent.h"

32 #include "core/dom/shadow/ShadowRoot.h"	32 #include "core/dom/shadow/ShadowRoot.h"

33 #include "core/editing/Editor.h"	33 #include "core/editing/Editor.h"

34 #include "core/editing/FrameSelection.h"	34 #include "core/editing/FrameSelection.h"

35 #include "core/frame/Frame.h"	35 #include "core/frame/Frame.h"

36 #include "core/frame/FrameView.h"	36 #include "core/frame/FrameView.h"

37 #include "core/page/Page.h"	37 #include "core/page/Page.h"

38 #include "core/page/Settings.h"	38 #include "core/page/Settings.h"

39 #include "core/platform/graphics/GraphicsContextStateSaver.h"	39 #include "core/platform/graphics/GraphicsContextStateSaver.h"

40 #include "core/rendering/ColumnInfo.h"	40 #include "core/rendering/ColumnInfo.h"

	41 #include "core/rendering/GraphicsContextAnnotator.h"

41 #include "core/rendering/HitTestLocation.h"	42 #include "core/rendering/HitTestLocation.h"

42 #include "core/rendering/HitTestResult.h"	43 #include "core/rendering/HitTestResult.h"

43 #include "core/rendering/InlineIterator.h"	44 #include "core/rendering/InlineIterator.h"

44 #include "core/rendering/InlineTextBox.h"	45 #include "core/rendering/InlineTextBox.h"

45 #include "core/rendering/LayoutRepainter.h"	46 #include "core/rendering/LayoutRepainter.h"

46 #include "core/rendering/PaintInfo.h"	47 #include "core/rendering/PaintInfo.h"

47 #include "core/rendering/RenderCombineText.h"	48 #include "core/rendering/RenderCombineText.h"

48 #include "core/rendering/RenderDeprecatedFlexibleBox.h"	49 #include "core/rendering/RenderDeprecatedFlexibleBox.h"

49 #include "core/rendering/RenderFlexibleBox.h"	50 #include "core/rendering/RenderFlexibleBox.h"

50 #include "core/rendering/RenderGrid.h"	51 #include "core/rendering/RenderGrid.h"

(...skipping 5800 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
5851 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const	5852 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const

5852 {	5853 {

5853 showRenderObject();	5854 showRenderObject();

5854 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())	5855 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())

5855 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);	5856 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);

5856 }	5857 }

5857	5858

5858 #endif	5859 #endif

5859	5860

5860 } // namespace WebCore	5861 } // namespace WebCore

OLD	NEW