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

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

Issue 828433004: Fix renderName on RenderBlock and RenderParagraph. (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
« no previous file with comments | « no previous file | sky/engine/core/rendering/RenderParagraph.h » ('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) 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 1890 matching lines...) Expand 10 before | Expand all | Expand 10 after
1901 return child->isRenderBlock() ? toRenderBlock(child)->hasMarginBeforeQuirk() : child->style()->hasMarginBeforeQuirk(); 1901 return child->isRenderBlock() ? toRenderBlock(child)->hasMarginBeforeQuirk() : child->style()->hasMarginBeforeQuirk();
1902 } 1902 }
1903 1903
1904 bool RenderBlock::hasMarginAfterQuirk(const RenderBox* child) const 1904 bool RenderBlock::hasMarginAfterQuirk(const RenderBox* child) const
1905 { 1905 {
1906 return child->isRenderBlock() ? toRenderBlock(child)->hasMarginAfterQuirk() : child->style()->hasMarginAfterQuirk(); 1906 return child->isRenderBlock() ? toRenderBlock(child)->hasMarginAfterQuirk() : child->style()->hasMarginAfterQuirk();
1907 } 1907 }
1908 1908
1909 const char* RenderBlock::renderName() const 1909 const char* RenderBlock::renderName() const
1910 { 1910 {
1911 if (isInlineBlock())
1912 return "RenderBlock (inline-block)";
1911 if (isOutOfFlowPositioned()) 1913 if (isOutOfFlowPositioned())
1912 return "RenderBlock (positioned)"; 1914 return "RenderBlock (positioned)";
1913 if (isAnonymousBlock()) 1915 if (isAnonymousBlock())
1914 return "RenderBlock (anonymous)"; 1916 return "RenderBlock (anonymous)";
1915 if (isAnonymous()) 1917 if (isAnonymous())
1916 return "RenderBlock (generated)"; 1918 return "RenderBlock (generated)";
1917 if (isRelPositioned()) 1919 if (isRelPositioned())
1918 return "RenderBlock (relative positioned)"; 1920 return "RenderBlock (relative positioned)";
1919 return "RenderBlock"; 1921 return "RenderBlock";
1920 } 1922 }
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
2036 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 2038 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
2037 { 2039 {
2038 showRenderObject(); 2040 showRenderObject();
2039 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 2041 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
2040 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 2042 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
2041 } 2043 }
2042 2044
2043 #endif 2045 #endif
2044 2046
2045 } // namespace blink 2047 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | sky/engine/core/rendering/RenderParagraph.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698