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

Side by Side Diff: sky/engine/core/frame/FrameView.cpp

Issue 762723002: Remove ENABLE(COMPOSITOR). (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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) 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 843 matching lines...) Expand 10 before | Expand all | Expand 10 after
854 // addition of the base background color is not 854 // addition of the base background color is not
855 // technically part of the document background, but it 855 // technically part of the document background, but it
856 // otherwise poses problems when the aggregate is not 856 // otherwise poses problems when the aggregate is not
857 // fully opaque. 857 // fully opaque.
858 if (htmlElement && htmlElement->renderer()) 858 if (htmlElement && htmlElement->renderer())
859 result = result.blend(htmlElement->renderer()->style()->colorIncludingFa llback(CSSPropertyBackgroundColor)); 859 result = result.blend(htmlElement->renderer()->style()->colorIncludingFa llback(CSSPropertyBackgroundColor));
860 860
861 return result; 861 return result;
862 } 862 }
863 863
864 #if !ENABLE(COMPOSITOR)
865 void FrameView::paint(GraphicsContext* context, const IntRect& rect) 864 void FrameView::paint(GraphicsContext* context, const IntRect& rect)
866 { 865 {
867 paintContents(context, rect); 866 paintContents(context, rect);
868 } 867 }
869 #endif
870 868
871 void FrameView::paintContents(GraphicsContext* p, const IntRect& rect) 869 void FrameView::paintContents(GraphicsContext* p, const IntRect& rect)
872 { 870 {
873 Document* document = m_frame->document(); 871 Document* document = m_frame->document();
874 872
875 #ifndef NDEBUG 873 #ifndef NDEBUG
876 bool fillWithRed; 874 bool fillWithRed;
877 if (isTransparent()) 875 if (isTransparent())
878 fillWithRed = false; // Transparent, don't fill with red. 876 fillWithRed = false; // Transparent, don't fill with red.
879 else if (m_paintBehavior & PaintBehaviorSelectionOnly) 877 else if (m_paintBehavior & PaintBehaviorSelectionOnly)
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
1121 void FrameView::setLayoutSizeInternal(const IntSize& size) 1119 void FrameView::setLayoutSizeInternal(const IntSize& size)
1122 { 1120 {
1123 if (m_layoutSize == size) 1121 if (m_layoutSize == size)
1124 return; 1122 return;
1125 1123
1126 m_layoutSize = size; 1124 m_layoutSize = size;
1127 contentsResized(); 1125 contentsResized();
1128 } 1126 }
1129 1127
1130 } // namespace blink 1128 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/frame/FrameView.h ('k') | sky/engine/core/rendering/compositing/RenderLayerCompositor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698