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

Side by Side Diff: Source/core/css/resolver/StyleAdjuster.cpp

Issue 930833003: Move and rename RenderReplaced and RenderHTMLCanvas to Layout{Replaced,HTMLCanvas}. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: No need to declare renderName() at all. Created 5 years, 10 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/core.gypi ('k') | Source/core/frame/FrameView.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) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 23 matching lines...) Expand all
34 #include "core/dom/ContainerNode.h" 34 #include "core/dom/ContainerNode.h"
35 #include "core/dom/Document.h" 35 #include "core/dom/Document.h"
36 #include "core/dom/Element.h" 36 #include "core/dom/Element.h"
37 #include "core/frame/FrameView.h" 37 #include "core/frame/FrameView.h"
38 #include "core/frame/Settings.h" 38 #include "core/frame/Settings.h"
39 #include "core/html/HTMLIFrameElement.h" 39 #include "core/html/HTMLIFrameElement.h"
40 #include "core/html/HTMLInputElement.h" 40 #include "core/html/HTMLInputElement.h"
41 #include "core/html/HTMLPlugInElement.h" 41 #include "core/html/HTMLPlugInElement.h"
42 #include "core/html/HTMLTableCellElement.h" 42 #include "core/html/HTMLTableCellElement.h"
43 #include "core/html/HTMLTextAreaElement.h" 43 #include "core/html/HTMLTextAreaElement.h"
44 #include "core/layout/LayoutReplaced.h"
44 #include "core/layout/LayoutTheme.h" 45 #include "core/layout/LayoutTheme.h"
45 #include "core/layout/style/GridPosition.h" 46 #include "core/layout/style/GridPosition.h"
46 #include "core/layout/style/LayoutStyle.h" 47 #include "core/layout/style/LayoutStyle.h"
47 #include "core/layout/style/LayoutStyleConstants.h" 48 #include "core/layout/style/LayoutStyleConstants.h"
48 #include "core/rendering/RenderReplaced.h"
49 #include "core/svg/SVGSVGElement.h" 49 #include "core/svg/SVGSVGElement.h"
50 #include "platform/Length.h" 50 #include "platform/Length.h"
51 #include "platform/transforms/TransformOperations.h" 51 #include "platform/transforms/TransformOperations.h"
52 #include "wtf/Assertions.h" 52 #include "wtf/Assertions.h"
53 53
54 namespace blink { 54 namespace blink {
55 55
56 using namespace HTMLNames; 56 using namespace HTMLNames;
57 57
58 static EDisplay equivalentBlockDisplay(EDisplay display, bool isFloating, bool s trictParsing) 58 static EDisplay equivalentBlockDisplay(EDisplay display, bool isFloating, bool s trictParsing)
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 return; 408 return;
409 } 409 }
410 410
411 if (isHTMLPlugInElement(element)) { 411 if (isHTMLPlugInElement(element)) {
412 style.setRequiresAcceleratedCompositingForExternalReasons(toHTMLPlugInEl ement(element).shouldAccelerate()); 412 style.setRequiresAcceleratedCompositingForExternalReasons(toHTMLPlugInEl ement(element).shouldAccelerate());
413 413
414 // Plugins should get the standard replaced width/height instead of 'aut o'. 414 // Plugins should get the standard replaced width/height instead of 'aut o'.
415 // Replaced renderers get this for free, and fallback content doesn't co unt. 415 // Replaced renderers get this for free, and fallback content doesn't co unt.
416 if (toHTMLPlugInElement(element).usePlaceholderContent()) { 416 if (toHTMLPlugInElement(element).usePlaceholderContent()) {
417 if (style.width().isAuto()) 417 if (style.width().isAuto())
418 style.setWidth(Length(RenderReplaced::defaultWidth, Fixed)); 418 style.setWidth(Length(LayoutReplaced::defaultWidth, Fixed));
419 if (style.height().isAuto()) 419 if (style.height().isAuto())
420 style.setHeight(Length(RenderReplaced::defaultHeight, Fixed)); 420 style.setHeight(Length(LayoutReplaced::defaultHeight, Fixed));
421 } 421 }
422 422
423 return; 423 return;
424 } 424 }
425 } 425 }
426 426
427 void StyleAdjuster::adjustOverflow(LayoutStyle& style) 427 void StyleAdjuster::adjustOverflow(LayoutStyle& style)
428 { 428 {
429 ASSERT(style.overflowX() != OVISIBLE || style.overflowY() != OVISIBLE); 429 ASSERT(style.overflowX() != OVISIBLE || style.overflowY() != OVISIBLE);
430 430
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 if (style.writingMode() != TopToBottomWritingMode && (style.display() == BOX || style.display() == INLINE_BOX)) 486 if (style.writingMode() != TopToBottomWritingMode && (style.display() == BOX || style.display() == INLINE_BOX))
487 style.setWritingMode(TopToBottomWritingMode); 487 style.setWritingMode(TopToBottomWritingMode);
488 488
489 if (parentStyle.isDisplayFlexibleOrGridBox()) { 489 if (parentStyle.isDisplayFlexibleOrGridBox()) {
490 style.setFloating(NoFloat); 490 style.setFloating(NoFloat);
491 style.setDisplay(equivalentBlockDisplay(style.display(), style.isFloatin g(), !m_useQuirksModeStyles)); 491 style.setDisplay(equivalentBlockDisplay(style.display(), style.isFloatin g(), !m_useQuirksModeStyles));
492 } 492 }
493 } 493 }
494 494
495 } 495 }
OLDNEW
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/frame/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698