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

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

Issue 17471008: Rework compositor touch hit testing (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Various fixes and test additions Created 7 years, 5 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
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) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
7 * Copyright (C) 2010 Google Inc. All rights reserved. 7 * Copyright (C) 2010 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 2536 matching lines...) Expand 10 before | Expand all | Expand 10 after
2547 if (continuation) { 2547 if (continuation) {
2548 if (!continuationMap) 2548 if (!continuationMap)
2549 continuationMap = new ContinuationMap; 2549 continuationMap = new ContinuationMap;
2550 continuationMap->set(this, continuation); 2550 continuationMap->set(this, continuation);
2551 } else { 2551 } else {
2552 if (continuationMap) 2552 if (continuationMap)
2553 continuationMap->remove(this); 2553 continuationMap->remove(this);
2554 } 2554 }
2555 } 2555 }
2556 2556
2557 void RenderBoxModelObject::computeLayerHitTestRects(LayerHitTestRects& rects) co nst
2558 {
2559 RenderLayerModelObject::computeLayerHitTestRects(rects);
2560
2561 // If there is a continuation of this root node, then it won't otherwise
2562 // be picked up by the tree walk, so we need to consult it here too.
2563 if (continuation())
2564 continuation()->computeLayerHitTestRects(rects);
2565 }
2566
2557 RenderObject* RenderBoxModelObject::firstLetterRemainingText() const 2567 RenderObject* RenderBoxModelObject::firstLetterRemainingText() const
2558 { 2568 {
2559 if (!firstLetterRemainingTextMap) 2569 if (!firstLetterRemainingTextMap)
2560 return 0; 2570 return 0;
2561 return firstLetterRemainingTextMap->get(this); 2571 return firstLetterRemainingTextMap->get(this);
2562 } 2572 }
2563 2573
2564 void RenderBoxModelObject::setFirstLetterRemainingText(RenderObject* remainingTe xt) 2574 void RenderBoxModelObject::setFirstLetterRemainingText(RenderObject* remainingTe xt)
2565 { 2575 {
2566 if (remainingText) { 2576 if (remainingText) {
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
2753 ASSERT(!beforeChild || toBoxModelObject == beforeChild->parent()); 2763 ASSERT(!beforeChild || toBoxModelObject == beforeChild->parent());
2754 for (RenderObject* child = startChild; child && child != endChild; ) { 2764 for (RenderObject* child = startChild; child && child != endChild; ) {
2755 // Save our next sibling as moveChildTo will clear it. 2765 // Save our next sibling as moveChildTo will clear it.
2756 RenderObject* nextSibling = child->nextSibling(); 2766 RenderObject* nextSibling = child->nextSibling();
2757 moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert); 2767 moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert);
2758 child = nextSibling; 2768 child = nextSibling;
2759 } 2769 }
2760 } 2770 }
2761 2771
2762 } // namespace WebCore 2772 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698