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

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

Issue 15973002: Remove NonCompositedContentHost -- Take 2 (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: adding back annotation. final rebase. 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 | Annotate | Revision Log
« no previous file with comments | « Source/WebKit/chromium/src/WebViewImpl.cpp ('k') | Source/core/rendering/RenderBox.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) 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 2025 matching lines...) Expand 10 before | Expand all | Expand 10 after
2036 } 2036 }
2037 2037
2038 bool FrameView::isTransparent() const 2038 bool FrameView::isTransparent() const
2039 { 2039 {
2040 return m_isTransparent; 2040 return m_isTransparent;
2041 } 2041 }
2042 2042
2043 void FrameView::setTransparent(bool isTransparent) 2043 void FrameView::setTransparent(bool isTransparent)
2044 { 2044 {
2045 m_isTransparent = isTransparent; 2045 m_isTransparent = isTransparent;
2046 if (renderView() && renderView()->layer()->backing())
2047 renderView()->layer()->backing()->updateContentsOpaque();
2046 } 2048 }
2047 2049
2048 bool FrameView::hasOpaqueBackground() const 2050 bool FrameView::hasOpaqueBackground() const
2049 { 2051 {
2050 return !m_isTransparent && !m_baseBackgroundColor.hasAlpha(); 2052 return !m_isTransparent && !m_baseBackgroundColor.hasAlpha();
2051 } 2053 }
2052 2054
2053 Color FrameView::baseBackgroundColor() const 2055 Color FrameView::baseBackgroundColor() const
2054 { 2056 {
2055 return m_baseBackgroundColor; 2057 return m_baseBackgroundColor;
2056 } 2058 }
2057 2059
2058 void FrameView::setBaseBackgroundColor(const Color& backgroundColor) 2060 void FrameView::setBaseBackgroundColor(const Color& backgroundColor)
2059 { 2061 {
2060 if (!backgroundColor.isValid()) 2062 if (!backgroundColor.isValid())
2061 m_baseBackgroundColor = Color::white; 2063 m_baseBackgroundColor = Color::white;
2062 else 2064 else
2063 m_baseBackgroundColor = backgroundColor; 2065 m_baseBackgroundColor = backgroundColor;
2064 2066
2067 if (renderView() && renderView()->layer()->backing())
2068 renderView()->layer()->backing()->updateContentsOpaque();
2065 recalculateScrollbarOverlayStyle(); 2069 recalculateScrollbarOverlayStyle();
2066 } 2070 }
2067 2071
2068 void FrameView::updateBackgroundRecursively(const Color& backgroundColor, bool t ransparent) 2072 void FrameView::updateBackgroundRecursively(const Color& backgroundColor, bool t ransparent)
2069 { 2073 {
2070 for (Frame* frame = m_frame.get(); frame; frame = frame->tree()->traverseNex t(m_frame.get())) { 2074 for (Frame* frame = m_frame.get(); frame; frame = frame->tree()->traverseNex t(m_frame.get())) {
2071 if (FrameView* view = frame->view()) { 2075 if (FrameView* view = frame->view()) {
2072 view->setTransparent(transparent); 2076 view->setTransparent(transparent);
2073 view->setBaseBackgroundColor(backgroundColor); 2077 view->setBaseBackgroundColor(backgroundColor);
2074 } 2078 }
(...skipping 1328 matching lines...) Expand 10 before | Expand all | Expand 10 after
3403 } 3407 }
3404 3408
3405 AXObjectCache* FrameView::axObjectCache() const 3409 AXObjectCache* FrameView::axObjectCache() const
3406 { 3410 {
3407 if (frame() && frame()->document()) 3411 if (frame() && frame()->document())
3408 return frame()->document()->existingAXObjectCache(); 3412 return frame()->document()->existingAXObjectCache();
3409 return 0; 3413 return 0;
3410 } 3414 }
3411 3415
3412 } // namespace WebCore 3416 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/src/WebViewImpl.cpp ('k') | Source/core/rendering/RenderBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698