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

Side by Side Diff: Source/core/rendering/RenderBlock.cpp

Issue 215843002: Dispel the myth that enclosingLayer can return zero (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/page/EventHandler.cpp ('k') | Source/core/rendering/RenderObject.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 * (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 2331 matching lines...) Expand 10 before | Expand all | Expand 10 after
2342 void RenderBlock::paintSelection(PaintInfo& paintInfo, const LayoutPoint& paintO ffset) 2342 void RenderBlock::paintSelection(PaintInfo& paintInfo, const LayoutPoint& paintO ffset)
2343 { 2343 {
2344 if (shouldPaintSelectionGaps() && paintInfo.phase == PaintPhaseForeground) { 2344 if (shouldPaintSelectionGaps() && paintInfo.phase == PaintPhaseForeground) {
2345 LayoutUnit lastTop = 0; 2345 LayoutUnit lastTop = 0;
2346 LayoutUnit lastLeft = logicalLeftSelectionOffset(this, lastTop); 2346 LayoutUnit lastLeft = logicalLeftSelectionOffset(this, lastTop);
2347 LayoutUnit lastRight = logicalRightSelectionOffset(this, lastTop); 2347 LayoutUnit lastRight = logicalRightSelectionOffset(this, lastTop);
2348 GraphicsContextStateSaver stateSaver(*paintInfo.context); 2348 GraphicsContextStateSaver stateSaver(*paintInfo.context);
2349 2349
2350 LayoutRect gapRectsBounds = selectionGaps(this, paintOffset, LayoutSize( ), lastTop, lastLeft, lastRight, &paintInfo); 2350 LayoutRect gapRectsBounds = selectionGaps(this, paintOffset, LayoutSize( ), lastTop, lastLeft, lastRight, &paintInfo);
2351 if (!gapRectsBounds.isEmpty()) { 2351 if (!gapRectsBounds.isEmpty()) {
2352 if (RenderLayer* layer = enclosingLayer()) { 2352 RenderLayer* layer = enclosingLayer();
2353 gapRectsBounds.moveBy(-paintOffset); 2353 gapRectsBounds.moveBy(-paintOffset);
2354 if (!hasLayer()) { 2354 if (!hasLayer()) {
2355 LayoutRect localBounds(gapRectsBounds); 2355 LayoutRect localBounds(gapRectsBounds);
2356 flipForWritingMode(localBounds); 2356 flipForWritingMode(localBounds);
2357 gapRectsBounds = localToContainerQuad(FloatRect(localBounds) , layer->renderer()).enclosingBoundingBox(); 2357 gapRectsBounds = localToContainerQuad(FloatRect(localBounds), la yer->renderer()).enclosingBoundingBox();
2358 if (layer->renderer()->hasOverflowClip()) 2358 if (layer->renderer()->hasOverflowClip())
2359 gapRectsBounds.move(layer->renderBox()->scrolledContentO ffset()); 2359 gapRectsBounds.move(layer->renderBox()->scrolledContentOffse t());
2360 }
2361 layer->addBlockSelectionGapsBounds(gapRectsBounds);
2362 } 2360 }
2361 layer->addBlockSelectionGapsBounds(gapRectsBounds);
2363 } 2362 }
2364 } 2363 }
2365 } 2364 }
2366 2365
2367 static void clipOutPositionedObjects(const PaintInfo* paintInfo, const LayoutPoi nt& offset, TrackedRendererListHashSet* positionedObjects) 2366 static void clipOutPositionedObjects(const PaintInfo* paintInfo, const LayoutPoi nt& offset, TrackedRendererListHashSet* positionedObjects)
2368 { 2367 {
2369 if (!positionedObjects) 2368 if (!positionedObjects)
2370 return; 2369 return;
2371 2370
2372 TrackedRendererListHashSet::const_iterator end = positionedObjects->end(); 2371 TrackedRendererListHashSet::const_iterator end = positionedObjects->end();
(...skipping 2667 matching lines...) Expand 10 before | Expand all | Expand 10 after
5040 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 5039 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
5041 { 5040 {
5042 showRenderObject(); 5041 showRenderObject();
5043 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 5042 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
5044 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 5043 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
5045 } 5044 }
5046 5045
5047 #endif 5046 #endif
5048 5047
5049 } // namespace WebCore 5048 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/page/EventHandler.cpp ('k') | Source/core/rendering/RenderObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698