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

Unified 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, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/rendering/RenderInline.h ('k') | Source/WebCore/rendering/RenderLayer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/rendering/RenderInline.cpp
diff --git a/Source/WebCore/rendering/RenderInline.cpp b/Source/WebCore/rendering/RenderInline.cpp
index 6788007858ccc6f93b7566fef46e9b0f06900464..d67eae9595f0bed33ecbdc222c1ecbb7c562bdfa 100644
--- a/Source/WebCore/rendering/RenderInline.cpp
+++ b/Source/WebCore/rendering/RenderInline.cpp
@@ -41,7 +41,7 @@
#include "VisiblePosition.h"
#include "WebCoreMemoryInstrumentation.h"
-#if ENABLE(DASHBOARD_SUPPORT) || ENABLE(DRAGGABLE_REGION)
+#if ENABLE(DRAGGABLE_REGION)
#include "Frame.h"
#endif
@@ -1556,49 +1556,13 @@ void RenderInline::paintOutlineForLine(GraphicsContext* graphicsContext, const L
antialias);
}
-#if ENABLE(DASHBOARD_SUPPORT) || ENABLE(DRAGGABLE_REGION)
+#if ENABLE(DRAGGABLE_REGION)
void RenderInline::addAnnotatedRegions(Vector<AnnotatedRegionValue>& regions)
{
// Convert the style regions to absolute coordinates.
if (style()->visibility() != VISIBLE)
return;
-#if ENABLE(DASHBOARD_SUPPORT)
- const Vector<StyleDashboardRegion>& styleRegions = style()->dashboardRegions();
- unsigned i, count = styleRegions.size();
- for (i = 0; i < count; i++) {
- StyleDashboardRegion styleRegion = styleRegions[i];
-
- LayoutRect linesBoundingBox = this->linesBoundingBox();
- LayoutUnit w = linesBoundingBox.width();
- LayoutUnit h = linesBoundingBox.height();
-
- AnnotatedRegionValue region;
- region.label = styleRegion.label;
- region.bounds = LayoutRect(linesBoundingBox.x() + styleRegion.offset.left().value(),
- linesBoundingBox.y() + styleRegion.offset.top().value(),
- w - styleRegion.offset.left().value() - styleRegion.offset.right().value(),
- h - styleRegion.offset.top().value() - styleRegion.offset.bottom().value());
- region.type = styleRegion.type;
-
- RenderObject* container = containingBlock();
- if (!container)
- container = this;
-
- region.clip = region.bounds;
- container->computeAbsoluteRepaintRect(region.clip);
- if (region.clip.height() < 0) {
- region.clip.setHeight(0);
- region.clip.setWidth(0);
- }
-
- FloatPoint absPos = container->localToAbsolute();
- region.bounds.setX(absPos.x() + region.bounds.x());
- region.bounds.setY(absPos.y() + region.bounds.y());
-
- regions.append(region);
- }
-#else // ENABLE(DRAGGABLE_REGION)
if (style()->getDraggableRegionMode() == DraggableRegionNone)
return;
@@ -1615,7 +1579,6 @@ void RenderInline::addAnnotatedRegions(Vector<AnnotatedRegionValue>& regions)
region.bounds.setY(absPos.y() + region.bounds.y());
regions.append(region);
-#endif
}
#endif
« 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