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

Side by Side Diff: Source/core/frame/FrameView.cpp

Issue 59063003: Don't coerce pointers to compositor layer mappings to booleans. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Respond to reviewer feedback. Created 7 years, 1 month 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Dirk Mueller <mueller@kde.org> 5 * 2000 Dirk Mueller <mueller@kde.org>
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * Copyright (C) 2009 Google Inc. All rights reserved. 9 * Copyright (C) 2009 Google Inc. All rights reserved.
10 * 10 *
(...skipping 2059 matching lines...) Expand 10 before | Expand all | Expand 10 after
2070 } 2070 }
2071 2071
2072 bool FrameView::isTransparent() const 2072 bool FrameView::isTransparent() const
2073 { 2073 {
2074 return m_isTransparent; 2074 return m_isTransparent;
2075 } 2075 }
2076 2076
2077 void FrameView::setTransparent(bool isTransparent) 2077 void FrameView::setTransparent(bool isTransparent)
2078 { 2078 {
2079 m_isTransparent = isTransparent; 2079 m_isTransparent = isTransparent;
2080 if (renderView() && renderView()->layer()->compositedLayerMapping()) 2080 if (renderView() && renderView()->layer()->compositingState() == PaintsIntoO wnBacking)
2081 renderView()->layer()->compositedLayerMapping()->updateContentsOpaque(); 2081 renderView()->layer()->compositedLayerMapping()->updateContentsOpaque();
2082 } 2082 }
2083 2083
2084 bool FrameView::hasOpaqueBackground() const 2084 bool FrameView::hasOpaqueBackground() const
2085 { 2085 {
2086 return !m_isTransparent && !m_baseBackgroundColor.hasAlpha(); 2086 return !m_isTransparent && !m_baseBackgroundColor.hasAlpha();
2087 } 2087 }
2088 2088
2089 Color FrameView::baseBackgroundColor() const 2089 Color FrameView::baseBackgroundColor() const
2090 { 2090 {
2091 return m_baseBackgroundColor; 2091 return m_baseBackgroundColor;
2092 } 2092 }
2093 2093
2094 void FrameView::setBaseBackgroundColor(const Color& backgroundColor) 2094 void FrameView::setBaseBackgroundColor(const Color& backgroundColor)
2095 { 2095 {
2096 if (!backgroundColor.isValid()) 2096 if (!backgroundColor.isValid())
2097 m_baseBackgroundColor = Color::white; 2097 m_baseBackgroundColor = Color::white;
2098 else 2098 else
2099 m_baseBackgroundColor = backgroundColor; 2099 m_baseBackgroundColor = backgroundColor;
2100 2100
2101 if (CompositedLayerMapping* compositedLayerMapping = renderView() ? renderVi ew()->layer()->compositedLayerMapping() : 0) { 2101 if (renderView() && renderView()->layer()->compositingState() == PaintsIntoO wnBacking) {
2102 CompositedLayerMappingPtr compositedLayerMapping = renderView()->layer() ->compositedLayerMapping();
2102 compositedLayerMapping->updateContentsOpaque(); 2103 compositedLayerMapping->updateContentsOpaque();
2103 if (compositedLayerMapping->mainGraphicsLayer()) 2104 if (compositedLayerMapping->mainGraphicsLayer())
2104 compositedLayerMapping->mainGraphicsLayer()->setNeedsDisplay(); 2105 compositedLayerMapping->mainGraphicsLayer()->setNeedsDisplay();
2105 } 2106 }
2106 recalculateScrollbarOverlayStyle(); 2107 recalculateScrollbarOverlayStyle();
2107 } 2108 }
2108 2109
2109 void FrameView::updateBackgroundRecursively(const Color& backgroundColor, bool t ransparent) 2110 void FrameView::updateBackgroundRecursively(const Color& backgroundColor, bool t ransparent)
2110 { 2111 {
2111 for (Frame* frame = m_frame.get(); frame; frame = frame->tree().traverseNext (m_frame.get())) { 2112 for (Frame* frame = m_frame.get(); frame; frame = frame->tree().traverseNext (m_frame.get())) {
(...skipping 1396 matching lines...) Expand 10 before | Expand all | Expand 10 after
3508 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation) 3509 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation)
3509 { 3510 {
3510 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); 3511 ScrollableArea::willRemoveScrollbar(scrollbar, orientation);
3511 if (AXObjectCache* cache = axObjectCache()) { 3512 if (AXObjectCache* cache = axObjectCache()) {
3512 cache->remove(scrollbar); 3513 cache->remove(scrollbar);
3513 cache->handleScrollbarUpdate(this); 3514 cache->handleScrollbarUpdate(this);
3514 } 3515 }
3515 } 3516 }
3516 3517
3517 } // namespace WebCore 3518 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698