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

Side by Side Diff: Source/WebKit/chromium/src/NonCompositedContentHost.cpp

Issue 9358057: Merge 107094 - Chromium: Fix Mac rubber band overhang drawing on composited pages and re-enable tes… (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 years, 10 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
« no previous file with comments | « Source/WebKit/chromium/ChangeLog ('k') | no next file » | 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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 27 matching lines...) Expand all
38 NonCompositedContentHost::NonCompositedContentHost(PassOwnPtr<WebCore::LayerPain terChromium> contentPaint) 38 NonCompositedContentHost::NonCompositedContentHost(PassOwnPtr<WebCore::LayerPain terChromium> contentPaint)
39 : m_contentPaint(contentPaint) 39 : m_contentPaint(contentPaint)
40 , m_showDebugBorders(false) 40 , m_showDebugBorders(false)
41 { 41 {
42 m_graphicsLayer = WebCore::GraphicsLayer::create(this); 42 m_graphicsLayer = WebCore::GraphicsLayer::create(this);
43 #ifndef NDEBUG 43 #ifndef NDEBUG
44 m_graphicsLayer->setName("non-composited content"); 44 m_graphicsLayer->setName("non-composited content");
45 #endif 45 #endif
46 m_graphicsLayer->setDrawsContent(true); 46 m_graphicsLayer->setDrawsContent(true);
47 m_graphicsLayer->platformLayer()->setIsNonCompositedContent(true); 47 m_graphicsLayer->platformLayer()->setIsNonCompositedContent(true);
48 #if !ENABLE(RUBBER_BANDING)
48 m_graphicsLayer->platformLayer()->setBackgroundCoversViewport(true); 49 m_graphicsLayer->platformLayer()->setBackgroundCoversViewport(true);
50 #endif
49 m_graphicsLayer->platformLayer()->setOpaque(true); 51 m_graphicsLayer->platformLayer()->setOpaque(true);
50 } 52 }
51 53
52 NonCompositedContentHost::~NonCompositedContentHost() 54 NonCompositedContentHost::~NonCompositedContentHost()
53 { 55 {
54 } 56 }
55 57
56 void NonCompositedContentHost::setBackgroundColor(const WebCore::Color& color) 58 void NonCompositedContentHost::setBackgroundColor(const WebCore::Color& color)
57 { 59 {
58 if (color.isValid()) 60 if (color.isValid())
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 { 177 {
176 return m_showDebugBorders; 178 return m_showDebugBorders;
177 } 179 }
178 180
179 bool NonCompositedContentHost::showRepaintCounter(const WebCore::GraphicsLayer*) const 181 bool NonCompositedContentHost::showRepaintCounter(const WebCore::GraphicsLayer*) const
180 { 182 {
181 return false; 183 return false;
182 } 184 }
183 185
184 } // namespace WebKit 186 } // namespace WebKit
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/ChangeLog ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698