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

Side by Side Diff: sky/engine/core/rendering/RenderBlock.cpp

Issue 870393002: Remove GraphicsContext annotations. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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
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) 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 16 matching lines...) Expand all
27 #include "sky/engine/core/dom/Document.h" 27 #include "sky/engine/core/dom/Document.h"
28 #include "sky/engine/core/dom/Element.h" 28 #include "sky/engine/core/dom/Element.h"
29 #include "sky/engine/core/dom/StyleEngine.h" 29 #include "sky/engine/core/dom/StyleEngine.h"
30 #include "sky/engine/core/dom/shadow/ShadowRoot.h" 30 #include "sky/engine/core/dom/shadow/ShadowRoot.h"
31 #include "sky/engine/core/editing/Editor.h" 31 #include "sky/engine/core/editing/Editor.h"
32 #include "sky/engine/core/editing/FrameSelection.h" 32 #include "sky/engine/core/editing/FrameSelection.h"
33 #include "sky/engine/core/frame/FrameView.h" 33 #include "sky/engine/core/frame/FrameView.h"
34 #include "sky/engine/core/frame/LocalFrame.h" 34 #include "sky/engine/core/frame/LocalFrame.h"
35 #include "sky/engine/core/frame/Settings.h" 35 #include "sky/engine/core/frame/Settings.h"
36 #include "sky/engine/core/page/Page.h" 36 #include "sky/engine/core/page/Page.h"
37 #include "sky/engine/core/rendering/GraphicsContextAnnotator.h"
38 #include "sky/engine/core/rendering/HitTestLocation.h" 37 #include "sky/engine/core/rendering/HitTestLocation.h"
39 #include "sky/engine/core/rendering/HitTestResult.h" 38 #include "sky/engine/core/rendering/HitTestResult.h"
40 #include "sky/engine/core/rendering/InlineIterator.h" 39 #include "sky/engine/core/rendering/InlineIterator.h"
41 #include "sky/engine/core/rendering/InlineTextBox.h" 40 #include "sky/engine/core/rendering/InlineTextBox.h"
42 #include "sky/engine/core/rendering/PaintInfo.h" 41 #include "sky/engine/core/rendering/PaintInfo.h"
43 #include "sky/engine/core/rendering/RenderFlexibleBox.h" 42 #include "sky/engine/core/rendering/RenderFlexibleBox.h"
44 #include "sky/engine/core/rendering/RenderInline.h" 43 #include "sky/engine/core/rendering/RenderInline.h"
45 #include "sky/engine/core/rendering/RenderLayer.h" 44 #include "sky/engine/core/rendering/RenderLayer.h"
46 #include "sky/engine/core/rendering/RenderObjectInlines.h" 45 #include "sky/engine/core/rendering/RenderObjectInlines.h"
47 #include "sky/engine/core/rendering/RenderParagraph.h" 46 #include "sky/engine/core/rendering/RenderParagraph.h"
(...skipping 460 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 { 507 {
509 if (TrackedRendererListHashSet* positionedDescendants = positionedObjects()) { 508 if (TrackedRendererListHashSet* positionedDescendants = positionedObjects()) {
510 TrackedRendererListHashSet::iterator end = positionedDescendants->end(); 509 TrackedRendererListHashSet::iterator end = positionedDescendants->end();
511 for (TrackedRendererListHashSet::iterator it = positionedDescendants->be gin(); it != end; ++it) 510 for (TrackedRendererListHashSet::iterator it = positionedDescendants->be gin(); it != end; ++it)
512 (*it)->setChildNeedsLayout(); 511 (*it)->setChildNeedsLayout();
513 } 512 }
514 } 513 }
515 514
516 void RenderBlock::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset) 515 void RenderBlock::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
517 { 516 {
518 ANNOTATE_GRAPHICS_CONTEXT(paintInfo, this);
519
520 LayoutPoint adjustedPaintOffset = paintOffset + location(); 517 LayoutPoint adjustedPaintOffset = paintOffset + location();
521 518
522 PaintPhase phase = paintInfo.phase; 519 PaintPhase phase = paintInfo.phase;
523 520
524 LayoutRect overflowBox; 521 LayoutRect overflowBox;
525 // Check if we need to do anything at all. 522 // Check if we need to do anything at all.
526 // FIXME: Could eliminate the isDocumentElement() check if we fix background painting so that the RenderView 523 // FIXME: Could eliminate the isDocumentElement() check if we fix background painting so that the RenderView
527 // paints the root's background. 524 // paints the root's background.
528 if (!isDocumentElement()) { 525 if (!isDocumentElement()) {
529 overflowBox = visualOverflowRect(); 526 overflowBox = visualOverflowRect();
(...skipping 1416 matching lines...) Expand 10 before | Expand all | Expand 10 after
1946 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 1943 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
1947 { 1944 {
1948 showRenderObject(); 1945 showRenderObject();
1949 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 1946 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
1950 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 1947 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
1951 } 1948 }
1952 1949
1953 #endif 1950 #endif
1954 1951
1955 } // namespace blink 1952 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/GraphicsContextAnnotator.cpp ('k') | sky/engine/core/rendering/RenderInline.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698