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

Side by Side Diff: Source/WebCore/rendering/RenderObject.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/RenderObject.h ('k') | Source/WebCore/rendering/style/RenderStyle.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) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 1848 matching lines...) Expand 10 before | Expand all | Expand 10 after
1859 1859
1860 void RenderObject::styleWillChange(StyleDifference diff, const RenderStyle* newS tyle) 1860 void RenderObject::styleWillChange(StyleDifference diff, const RenderStyle* newS tyle)
1861 { 1861 {
1862 if (m_style) { 1862 if (m_style) {
1863 // If our z-index changes value or our visibility changes, 1863 // If our z-index changes value or our visibility changes,
1864 // we need to dirty our stacking context's z-order list. 1864 // we need to dirty our stacking context's z-order list.
1865 if (newStyle) { 1865 if (newStyle) {
1866 bool visibilityChanged = m_style->visibility() != newStyle->visibili ty() 1866 bool visibilityChanged = m_style->visibility() != newStyle->visibili ty()
1867 || m_style->zIndex() != newStyle->zIndex() 1867 || m_style->zIndex() != newStyle->zIndex()
1868 || m_style->hasAutoZIndex() != newStyle->hasAutoZIndex(); 1868 || m_style->hasAutoZIndex() != newStyle->hasAutoZIndex();
1869 #if ENABLE(DASHBOARD_SUPPORT) || ENABLE(DRAGGABLE_REGION) 1869 #if ENABLE(DRAGGABLE_REGION)
1870 if (visibilityChanged) 1870 if (visibilityChanged)
1871 document()->setAnnotatedRegionsDirty(true); 1871 document()->setAnnotatedRegionsDirty(true);
1872 #endif 1872 #endif
1873 if (visibilityChanged) { 1873 if (visibilityChanged) {
1874 if (AXObjectCache* cache = document()->existingAXObjectCache()) 1874 if (AXObjectCache* cache = document()->existingAXObjectCache())
1875 cache->childrenChanged(parent()); 1875 cache->childrenChanged(parent());
1876 } 1876 }
1877 1877
1878 // Keep layer hierarchy visibility bits up to date if visibility cha nges. 1878 // Keep layer hierarchy visibility bits up to date if visibility cha nges.
1879 if (m_style->visibility() != newStyle->visibility()) { 1879 if (m_style->visibility() != newStyle->visibility()) {
(...skipping 980 matching lines...) Expand 10 before | Expand all | Expand 10 after
2860 resultColor = decorationColor(styleToUse); 2860 resultColor = decorationColor(styleToUse);
2861 if (decorations & UNDERLINE) 2861 if (decorations & UNDERLINE)
2862 underline = resultColor; 2862 underline = resultColor;
2863 if (decorations & OVERLINE) 2863 if (decorations & OVERLINE)
2864 overline = resultColor; 2864 overline = resultColor;
2865 if (decorations & LINE_THROUGH) 2865 if (decorations & LINE_THROUGH)
2866 linethrough = resultColor; 2866 linethrough = resultColor;
2867 } 2867 }
2868 } 2868 }
2869 2869
2870 #if ENABLE(DASHBOARD_SUPPORT) || ENABLE(DRAGGABLE_REGION) 2870 #if ENABLE(DRAGGABLE_REGION)
2871 void RenderObject::addAnnotatedRegions(Vector<AnnotatedRegionValue>& regions) 2871 void RenderObject::addAnnotatedRegions(Vector<AnnotatedRegionValue>& regions)
2872 { 2872 {
2873 // Convert the style regions to absolute coordinates. 2873 // Convert the style regions to absolute coordinates.
2874 if (style()->visibility() != VISIBLE || !isBox()) 2874 if (style()->visibility() != VISIBLE || !isBox())
2875 return; 2875 return;
2876 2876
2877 RenderBox* box = toRenderBox(this); 2877 RenderBox* box = toRenderBox(this);
2878 FloatPoint absPos = localToAbsolute(); 2878 FloatPoint absPos = localToAbsolute();
2879 2879
2880 #if ENABLE(DASHBOARD_SUPPORT)
2881 const Vector<StyleDashboardRegion>& styleRegions = style()->dashboardRegions ();
2882 unsigned i, count = styleRegions.size();
2883 for (i = 0; i < count; i++) {
2884 StyleDashboardRegion styleRegion = styleRegions[i];
2885
2886 LayoutUnit w = box->width();
2887 LayoutUnit h = box->height();
2888
2889 AnnotatedRegionValue region;
2890 region.label = styleRegion.label;
2891 region.bounds = LayoutRect(styleRegion.offset.left().value(),
2892 styleRegion.offset.top().value(),
2893 w - styleRegion.offset.left().value() - style Region.offset.right().value(),
2894 h - styleRegion.offset.top().value() - styleR egion.offset.bottom().value());
2895 region.type = styleRegion.type;
2896
2897 region.clip = region.bounds;
2898 computeAbsoluteRepaintRect(region.clip);
2899 if (region.clip.height() < 0) {
2900 region.clip.setHeight(0);
2901 region.clip.setWidth(0);
2902 }
2903
2904 region.bounds.setX(absPos.x() + styleRegion.offset.left().value());
2905 region.bounds.setY(absPos.y() + styleRegion.offset.top().value());
2906
2907 regions.append(region);
2908 }
2909 #else // ENABLE(DRAGGABLE_REGION)
2910 if (style()->getDraggableRegionMode() == DraggableRegionNone) 2880 if (style()->getDraggableRegionMode() == DraggableRegionNone)
2911 return; 2881 return;
2912 AnnotatedRegionValue region; 2882 AnnotatedRegionValue region;
2913 region.draggable = style()->getDraggableRegionMode() == DraggableRegionDrag; 2883 region.draggable = style()->getDraggableRegionMode() == DraggableRegionDrag;
2914 region.bounds = LayoutRect(absPos.x(), absPos.y(), box->width(), box->height ()); 2884 region.bounds = LayoutRect(absPos.x(), absPos.y(), box->width(), box->height ());
2915 regions.append(region); 2885 regions.append(region);
2916 #endif
2917 } 2886 }
2918 2887
2919 void RenderObject::collectAnnotatedRegions(Vector<AnnotatedRegionValue>& regions ) 2888 void RenderObject::collectAnnotatedRegions(Vector<AnnotatedRegionValue>& regions )
2920 { 2889 {
2921 // RenderTexts don't have their own style, they just use their parent's styl e, 2890 // RenderTexts don't have their own style, they just use their parent's styl e,
2922 // so we don't want to include them. 2891 // so we don't want to include them.
2923 if (isText()) 2892 if (isText())
2924 return; 2893 return;
2925 2894
2926 addAnnotatedRegions(regions); 2895 addAnnotatedRegions(regions);
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
3225 { 3194 {
3226 if (object1) { 3195 if (object1) {
3227 const WebCore::RenderObject* root = object1; 3196 const WebCore::RenderObject* root = object1;
3228 while (root->parent()) 3197 while (root->parent())
3229 root = root->parent(); 3198 root = root->parent();
3230 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3199 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3231 } 3200 }
3232 } 3201 }
3233 3202
3234 #endif 3203 #endif
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderObject.h ('k') | Source/WebCore/rendering/style/RenderStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698