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

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

Issue 13650009: Remove Dashboard support and supporting files. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix compiler error due to misspelling in code "Dashbard" Created 7 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « Source/WebCore/rendering/RenderInline.h ('k') | Source/WebCore/rendering/RenderLayer.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 23 matching lines...) Expand all
34 #include "RenderFlowThread.h" 34 #include "RenderFlowThread.h"
35 #include "RenderGeometryMap.h" 35 #include "RenderGeometryMap.h"
36 #include "RenderLayer.h" 36 #include "RenderLayer.h"
37 #include "RenderTheme.h" 37 #include "RenderTheme.h"
38 #include "RenderView.h" 38 #include "RenderView.h"
39 #include "StyleInheritedData.h" 39 #include "StyleInheritedData.h"
40 #include "TransformState.h" 40 #include "TransformState.h"
41 #include "VisiblePosition.h" 41 #include "VisiblePosition.h"
42 #include "WebCoreMemoryInstrumentation.h" 42 #include "WebCoreMemoryInstrumentation.h"
43 43
44 #if ENABLE(DASHBOARD_SUPPORT) || ENABLE(DRAGGABLE_REGION) 44 #if ENABLE(DRAGGABLE_REGION)
45 #include "Frame.h" 45 #include "Frame.h"
46 #endif 46 #endif
47 47
48 using namespace std; 48 using namespace std;
49 49
50 namespace WebCore { 50 namespace WebCore {
51 51
52 RenderInline::RenderInline(Element* element) 52 RenderInline::RenderInline(Element* element)
53 : RenderBoxModelObject(element) 53 : RenderBoxModelObject(element)
54 , m_alwaysCreateLineBoxes(false) 54 , m_alwaysCreateLineBoxes(false)
(...skipping 1494 matching lines...) Expand 10 before | Expand all | Expand 10 after
1549 pixelSnappedBox.x() - outlineWidth, 1549 pixelSnappedBox.x() - outlineWidth,
1550 pixelSnappedBox.maxY(), 1550 pixelSnappedBox.maxY(),
1551 pixelSnappedBox.maxX() + outlineWidth, 1551 pixelSnappedBox.maxX() + outlineWidth,
1552 pixelSnappedBox.maxY() + outlineWidth, 1552 pixelSnappedBox.maxY() + outlineWidth,
1553 BSBottom, outlineColor, outlineStyle, 1553 BSBottom, outlineColor, outlineStyle,
1554 outlineWidth, 1554 outlineWidth,
1555 outlineWidth, 1555 outlineWidth,
1556 antialias); 1556 antialias);
1557 } 1557 }
1558 1558
1559 #if ENABLE(DASHBOARD_SUPPORT) || ENABLE(DRAGGABLE_REGION) 1559 #if ENABLE(DRAGGABLE_REGION)
1560 void RenderInline::addAnnotatedRegions(Vector<AnnotatedRegionValue>& regions) 1560 void RenderInline::addAnnotatedRegions(Vector<AnnotatedRegionValue>& regions)
1561 { 1561 {
1562 // Convert the style regions to absolute coordinates. 1562 // Convert the style regions to absolute coordinates.
1563 if (style()->visibility() != VISIBLE) 1563 if (style()->visibility() != VISIBLE)
1564 return; 1564 return;
1565 1565
1566 #if ENABLE(DASHBOARD_SUPPORT)
1567 const Vector<StyleDashboardRegion>& styleRegions = style()->dashboardRegions ();
1568 unsigned i, count = styleRegions.size();
1569 for (i = 0; i < count; i++) {
1570 StyleDashboardRegion styleRegion = styleRegions[i];
1571
1572 LayoutRect linesBoundingBox = this->linesBoundingBox();
1573 LayoutUnit w = linesBoundingBox.width();
1574 LayoutUnit h = linesBoundingBox.height();
1575
1576 AnnotatedRegionValue region;
1577 region.label = styleRegion.label;
1578 region.bounds = LayoutRect(linesBoundingBox.x() + styleRegion.offset.lef t().value(),
1579 linesBoundingBox.y() + styleRegion.offset.top(). value(),
1580 w - styleRegion.offset.left().value() - styleReg ion.offset.right().value(),
1581 h - styleRegion.offset.top().value() - styleRegi on.offset.bottom().value());
1582 region.type = styleRegion.type;
1583
1584 RenderObject* container = containingBlock();
1585 if (!container)
1586 container = this;
1587
1588 region.clip = region.bounds;
1589 container->computeAbsoluteRepaintRect(region.clip);
1590 if (region.clip.height() < 0) {
1591 region.clip.setHeight(0);
1592 region.clip.setWidth(0);
1593 }
1594
1595 FloatPoint absPos = container->localToAbsolute();
1596 region.bounds.setX(absPos.x() + region.bounds.x());
1597 region.bounds.setY(absPos.y() + region.bounds.y());
1598
1599 regions.append(region);
1600 }
1601 #else // ENABLE(DRAGGABLE_REGION)
1602 if (style()->getDraggableRegionMode() == DraggableRegionNone) 1566 if (style()->getDraggableRegionMode() == DraggableRegionNone)
1603 return; 1567 return;
1604 1568
1605 AnnotatedRegionValue region; 1569 AnnotatedRegionValue region;
1606 region.draggable = style()->getDraggableRegionMode() == DraggableRegionDrag; 1570 region.draggable = style()->getDraggableRegionMode() == DraggableRegionDrag;
1607 region.bounds = linesBoundingBox(); 1571 region.bounds = linesBoundingBox();
1608 1572
1609 RenderObject* container = containingBlock(); 1573 RenderObject* container = containingBlock();
1610 if (!container) 1574 if (!container)
1611 container = this; 1575 container = this;
1612 1576
1613 FloatPoint absPos = container->localToAbsolute(); 1577 FloatPoint absPos = container->localToAbsolute();
1614 region.bounds.setX(absPos.x() + region.bounds.x()); 1578 region.bounds.setX(absPos.x() + region.bounds.x());
1615 region.bounds.setY(absPos.y() + region.bounds.y()); 1579 region.bounds.setY(absPos.y() + region.bounds.y());
1616 1580
1617 regions.append(region); 1581 regions.append(region);
1618 #endif
1619 } 1582 }
1620 #endif 1583 #endif
1621 1584
1622 void RenderInline::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const 1585 void RenderInline::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
1623 { 1586 {
1624 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering) ; 1587 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering) ;
1625 RenderBoxModelObject::reportMemoryUsage(memoryObjectInfo); 1588 RenderBoxModelObject::reportMemoryUsage(memoryObjectInfo);
1626 info.addMember(m_children, "children"); 1589 info.addMember(m_children, "children");
1627 info.addMember(m_lineBoxes, "lineBoxes"); 1590 info.addMember(m_lineBoxes, "lineBoxes");
1628 } 1591 }
1629 1592
1630 } // namespace WebCore 1593 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderInline.h ('k') | Source/WebCore/rendering/RenderLayer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698