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

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

Issue 16357011: Remove support for -webkit-color-correction (which we've never supported on (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: resolve merge conflicts, obey brace style changes Created 7 years, 6 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/rendering/RenderWidget.cpp ('k') | Source/core/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) 2003, 2006, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2006, 2008 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 // Now fill in any gaps on the line that occurred between two selected e lements. 457 // Now fill in any gaps on the line that occurred between two selected e lements.
458 LayoutUnit lastLogicalLeft = firstBox->logicalRight(); 458 LayoutUnit lastLogicalLeft = firstBox->logicalRight();
459 bool isPreviousBoxSelected = firstBox->selectionState() != RenderObject: :SelectionNone; 459 bool isPreviousBoxSelected = firstBox->selectionState() != RenderObject: :SelectionNone;
460 for (InlineBox* box = firstBox->nextLeafChild(); box; box = box->nextLea fChild()) { 460 for (InlineBox* box = firstBox->nextLeafChild(); box; box = box->nextLea fChild()) {
461 if (box->selectionState() != RenderObject::SelectionNone) { 461 if (box->selectionState() != RenderObject::SelectionNone) {
462 LayoutRect logicalRect(lastLogicalLeft, selTop, box->logicalLeft () - lastLogicalLeft, selHeight); 462 LayoutRect logicalRect(lastLogicalLeft, selTop, box->logicalLeft () - lastLogicalLeft, selHeight);
463 logicalRect.move(renderer()->isHorizontalWritingMode() ? offsetF romRootBlock : LayoutSize(offsetFromRootBlock.height(), offsetFromRootBlock.widt h())); 463 logicalRect.move(renderer()->isHorizontalWritingMode() ? offsetF romRootBlock : LayoutSize(offsetFromRootBlock.height(), offsetFromRootBlock.widt h()));
464 LayoutRect gapRect = rootBlock->logicalRectToPhysicalRect(rootBl ockPhysicalPosition, logicalRect); 464 LayoutRect gapRect = rootBlock->logicalRectToPhysicalRect(rootBl ockPhysicalPosition, logicalRect);
465 if (isPreviousBoxSelected && gapRect.width() > 0 && gapRect.heig ht() > 0) { 465 if (isPreviousBoxSelected && gapRect.width() > 0 && gapRect.heig ht() > 0) {
466 if (paintInfo && box->parent()->renderer()->style()->visibil ity() == VISIBLE) 466 if (paintInfo && box->parent()->renderer()->style()->visibil ity() == VISIBLE)
467 paintInfo->context->fillRect(gapRect, box->parent()->ren derer()->selectionBackgroundColor(), box->parent()->renderer()->style()->colorSp ace()); 467 paintInfo->context->fillRect(gapRect, box->parent()->ren derer()->selectionBackgroundColor());
468 // VisibleSelection may be non-contiguous, see comment above . 468 // VisibleSelection may be non-contiguous, see comment above .
469 result.uniteCenter(gapRect); 469 result.uniteCenter(gapRect);
470 } 470 }
471 lastLogicalLeft = box->logicalRight(); 471 lastLogicalLeft = box->logicalRight();
472 } 472 }
473 if (box == lastBox) 473 if (box == lastBox)
474 break; 474 break;
475 isPreviousBoxSelected = box->selectionState() != RenderObject::Selec tionNone; 475 isPreviousBoxSelected = box->selectionState() != RenderObject::Selec tionNone;
476 } 476 }
477 } 477 }
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
990 } 990 }
991 991
992 #ifndef NDEBUG 992 #ifndef NDEBUG
993 const char* RootInlineBox::boxName() const 993 const char* RootInlineBox::boxName() const
994 { 994 {
995 return "RootInlineBox"; 995 return "RootInlineBox";
996 } 996 }
997 #endif 997 #endif
998 998
999 } // namespace WebCore 999 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderWidget.cpp ('k') | Source/core/rendering/style/RenderStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698