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

Side by Side Diff: sky/engine/core/rendering/RenderBox.h

Issue 963253002: Move FilterEffectRenderer out of RenderLayer into RenderBox. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 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
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 * Copyright (C) 2003, 2006, 2007 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2006, 2007 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
11 * This library is distributed in the hope that it will be useful, 11 * This library is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14 * Library General Public License for more details. 14 * Library General Public License for more details.
15 * 15 *
16 * You should have received a copy of the GNU Library General Public License 16 * You should have received a copy of the GNU Library General Public License
17 * along with this library; see the file COPYING.LIB. If not, write to 17 * along with this library; see the file COPYING.LIB. If not, write to
18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
19 * Boston, MA 02110-1301, USA. 19 * Boston, MA 02110-1301, USA.
20 * 20 *
21 */ 21 */
22 22
23 #ifndef SKY_ENGINE_CORE_RENDERING_RENDERBOX_H_ 23 #ifndef SKY_ENGINE_CORE_RENDERING_RENDERBOX_H_
24 #define SKY_ENGINE_CORE_RENDERING_RENDERBOX_H_ 24 #define SKY_ENGINE_CORE_RENDERING_RENDERBOX_H_
25 25
26 #include "sky/engine/core/rendering/FilterEffectRenderer.h"
26 #include "sky/engine/core/rendering/RenderBoxModelObject.h" 27 #include "sky/engine/core/rendering/RenderBoxModelObject.h"
27 #include "sky/engine/core/rendering/RenderOverflow.h" 28 #include "sky/engine/core/rendering/RenderOverflow.h"
28 29
29 namespace blink { 30 namespace blink {
30 31
31 struct LayerPaintingInfo; 32 struct LayerPaintingInfo;
32 struct PaintInfo; 33 struct PaintInfo;
33 class HitTestingTransformState; 34 class HitTestingTransformState;
34 class RenderBlockFlow; 35 class RenderBlockFlow;
35 36
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 virtual void mapLocalToContainer(const RenderBox* paintInvalidationContainer , TransformState&, MapCoordinatesFlags = ApplyContainerFlip) const override; 479 virtual void mapLocalToContainer(const RenderBox* paintInvalidationContainer , TransformState&, MapCoordinatesFlags = ApplyContainerFlip) const override;
479 480
480 void paintRootBoxFillLayers(const PaintInfo&); 481 void paintRootBoxFillLayers(const PaintInfo&);
481 482
482 RenderObject* splitAnonymousBoxesAroundChild(RenderObject* beforeChild); 483 RenderObject* splitAnonymousBoxesAroundChild(RenderObject* beforeChild);
483 484
484 void updateIntrinsicContentLogicalHeight(LayoutUnit intrinsicContentLogicalH eight) const { m_intrinsicContentLogicalHeight = intrinsicContentLogicalHeight; } 485 void updateIntrinsicContentLogicalHeight(LayoutUnit intrinsicContentLogicalH eight) const { m_intrinsicContentLogicalHeight = intrinsicContentLogicalHeight; }
485 486
486 private: 487 private:
487 void updateFromStyle(); 488 void updateFromStyle();
489 void updateFilters();
488 490
489 PassRefPtr<HitTestingTransformState> createLocalTransformState( 491 PassRefPtr<HitTestingTransformState> createLocalTransformState(
490 RenderLayer* rootLayer, RenderLayer* containerLayer, 492 RenderLayer* rootLayer, RenderLayer* containerLayer,
491 const LayoutRect& hitTestRect, const HitTestLocation& hitTestLocation, 493 const LayoutRect& hitTestRect, const HitTestLocation& hitTestLocation,
492 const HitTestingTransformState* containerTransformState) const; 494 const HitTestingTransformState* containerTransformState) const;
493 bool hitTestNonLayerDescendants(const HitTestRequest& request, HitTestResult & result, 495 bool hitTestNonLayerDescendants(const HitTestRequest& request, HitTestResult & result,
494 const LayoutRect& layerBounds, const HitTestLocation& hitTestLocation); 496 const LayoutRect& layerBounds, const HitTestLocation& hitTestLocation);
495 497
496 void paintLayerContents(GraphicsContext*, const LayerPaintingInfo&); 498 void paintLayerContents(GraphicsContext*, const LayerPaintingInfo&);
497 499
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
548 550
549 // The preferred logical width of the element if it were to break its lines at every possible opportunity. 551 // The preferred logical width of the element if it were to break its lines at every possible opportunity.
550 LayoutUnit m_minPreferredLogicalWidth; 552 LayoutUnit m_minPreferredLogicalWidth;
551 553
552 // The preferred logical width of the element if it never breaks any lines a t all. 554 // The preferred logical width of the element if it never breaks any lines a t all.
553 LayoutUnit m_maxPreferredLogicalWidth; 555 LayoutUnit m_maxPreferredLogicalWidth;
554 556
555 // Our overflow information. 557 // Our overflow information.
556 OwnPtr<RenderOverflow> m_overflow; 558 OwnPtr<RenderOverflow> m_overflow;
557 559
560 OwnPtr<FilterEffectRenderer> m_filterRenderer;
561
558 private: 562 private:
559 OwnPtr<RenderLayer> m_layer; 563 OwnPtr<RenderLayer> m_layer;
560 OwnPtr<RenderBoxRareData> m_rareData; 564 OwnPtr<RenderBoxRareData> m_rareData;
561 }; 565 };
562 566
563 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBox, isBox()); 567 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBox, isBox());
564 568
565 inline RenderBox* RenderBox::previousSiblingBox() const 569 inline RenderBox* RenderBox::previousSiblingBox() const
566 { 570 {
567 return toRenderBox(previousSibling()); 571 return toRenderBox(previousSibling());
(...skipping 30 matching lines...) Expand all
598 if (UNLIKELY(inlineBoxWrapper() != 0)) 602 if (UNLIKELY(inlineBoxWrapper() != 0))
599 deleteLineBoxWrapper(); 603 deleteLineBoxWrapper();
600 } 604 }
601 605
602 ensureRareData().m_inlineBoxWrapper = boxWrapper; 606 ensureRareData().m_inlineBoxWrapper = boxWrapper;
603 } 607 }
604 608
605 } // namespace blink 609 } // namespace blink
606 610
607 #endif // SKY_ENGINE_CORE_RENDERING_RENDERBOX_H_ 611 #endif // SKY_ENGINE_CORE_RENDERING_RENDERBOX_H_
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/FilterEffectRenderer.cpp ('k') | sky/engine/core/rendering/RenderBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698