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

Side by Side Diff: third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp

Issue 2764313002: Move plugins to be stored in HTMLPlugInElement. (Closed)
Patch Set: Update comments about duplicating code Created 3 years, 8 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) 2009, 2010, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2009, 2010, 2011 Apple 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 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 if (!layoutObject.style()->hasBackground()) 141 if (!layoutObject.style()->hasBackground())
142 return true; 142 return true;
143 143
144 // Simple background that is contained within the contents rect. 144 // Simple background that is contained within the contents rect.
145 return contentsRect(layoutObject).contains(backgroundRect(layoutObject)); 145 return contentsRect(layoutObject).contains(backgroundRect(layoutObject));
146 } 146 }
147 147
148 static WebLayer* platformLayerForPlugin(LayoutObject& layoutObject) { 148 static WebLayer* platformLayerForPlugin(LayoutObject& layoutObject) {
149 if (!layoutObject.isEmbeddedObject()) 149 if (!layoutObject.isEmbeddedObject())
150 return nullptr; 150 return nullptr;
151 FrameViewBase* frameViewBase = 151 PluginView* plugin = toLayoutEmbeddedObject(layoutObject).plugin();
152 toLayoutEmbeddedObject(layoutObject).frameViewBase(); 152 return plugin ? plugin->platformLayer() : nullptr;
153 if (!frameViewBase || !frameViewBase->isPluginView())
154 return nullptr;
155 return toPluginView(frameViewBase)->platformLayer();
156 } 153 }
157 154
158 static inline bool isAcceleratedContents(LayoutObject& layoutObject) { 155 static inline bool isAcceleratedContents(LayoutObject& layoutObject) {
159 return isAcceleratedCanvas(layoutObject) || 156 return isAcceleratedCanvas(layoutObject) ||
160 (layoutObject.isEmbeddedObject() && 157 (layoutObject.isEmbeddedObject() &&
161 toLayoutEmbeddedObject(layoutObject) 158 toLayoutEmbeddedObject(layoutObject)
162 .requiresAcceleratedCompositing()) || 159 .requiresAcceleratedCompositing()) ||
163 layoutObject.isVideo(); 160 layoutObject.isVideo();
164 } 161 }
165 162
(...skipping 3383 matching lines...) Expand 10 before | Expand all | Expand 10 after
3549 } else if (graphicsLayer == m_decorationOutlineLayer.get()) { 3546 } else if (graphicsLayer == m_decorationOutlineLayer.get()) {
3550 name = "Decoration Layer"; 3547 name = "Decoration Layer";
3551 } else { 3548 } else {
3552 NOTREACHED(); 3549 NOTREACHED();
3553 } 3550 }
3554 3551
3555 return name; 3552 return name;
3556 } 3553 }
3557 3554
3558 } // namespace blink 3555 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698