| OLD | NEW | 
|---|
| 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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 144   if (!layoutObject.style()->hasBackground()) | 144   if (!layoutObject.style()->hasBackground()) | 
| 145     return true; | 145     return true; | 
| 146 | 146 | 
| 147   // Simple background that is contained within the contents rect. | 147   // Simple background that is contained within the contents rect. | 
| 148   return contentsRect(layoutObject).contains(backgroundRect(layoutObject)); | 148   return contentsRect(layoutObject).contains(backgroundRect(layoutObject)); | 
| 149 } | 149 } | 
| 150 | 150 | 
| 151 static WebLayer* platformLayerForPlugin(LayoutObject& layoutObject) { | 151 static WebLayer* platformLayerForPlugin(LayoutObject& layoutObject) { | 
| 152   if (!layoutObject.isEmbeddedObject()) | 152   if (!layoutObject.isEmbeddedObject()) | 
| 153     return nullptr; | 153     return nullptr; | 
| 154   FrameViewBase* frameViewBase = toLayoutEmbeddedObject(layoutObject).widget(); | 154   FrameViewBase* frameViewBase = | 
|  | 155       toLayoutEmbeddedObject(layoutObject).frameViewBase(); | 
| 155   if (!frameViewBase || !frameViewBase->isPluginView()) | 156   if (!frameViewBase || !frameViewBase->isPluginView()) | 
| 156     return nullptr; | 157     return nullptr; | 
| 157   return toPluginView(frameViewBase)->platformLayer(); | 158   return toPluginView(frameViewBase)->platformLayer(); | 
| 158 } | 159 } | 
| 159 | 160 | 
| 160 static inline bool isAcceleratedContents(LayoutObject& layoutObject) { | 161 static inline bool isAcceleratedContents(LayoutObject& layoutObject) { | 
| 161   return isAcceleratedCanvas(layoutObject) || | 162   return isAcceleratedCanvas(layoutObject) || | 
| 162          (layoutObject.isEmbeddedObject() && | 163          (layoutObject.isEmbeddedObject() && | 
| 163           toLayoutEmbeddedObject(layoutObject) | 164           toLayoutEmbeddedObject(layoutObject) | 
| 164               .requiresAcceleratedCompositing()) || | 165               .requiresAcceleratedCompositing()) || | 
| (...skipping 3322 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 3487   } else if (graphicsLayer == m_decorationOutlineLayer.get()) { | 3488   } else if (graphicsLayer == m_decorationOutlineLayer.get()) { | 
| 3488     name = "Decoration Layer"; | 3489     name = "Decoration Layer"; | 
| 3489   } else { | 3490   } else { | 
| 3490     ASSERT_NOT_REACHED(); | 3491     ASSERT_NOT_REACHED(); | 
| 3491   } | 3492   } | 
| 3492 | 3493 | 
| 3493   return name; | 3494   return name; | 
| 3494 } | 3495 } | 
| 3495 | 3496 | 
| 3496 }  // namespace blink | 3497 }  // namespace blink | 
| OLD | NEW | 
|---|