Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 199 void WebPopupMenuImpl::animate(double) | 199 void WebPopupMenuImpl::animate(double) |
| 200 { | 200 { |
| 201 } | 201 } |
| 202 | 202 |
| 203 void WebPopupMenuImpl::layout() | 203 void WebPopupMenuImpl::layout() |
| 204 { | 204 { |
| 205 } | 205 } |
| 206 | 206 |
| 207 void WebPopupMenuImpl::enterForceCompositingMode(bool enter) | 207 void WebPopupMenuImpl::enterForceCompositingMode(bool enter) |
| 208 { | 208 { |
| 209 // FIXME: Is this function really correct? The other overrides of this funct ion | |
|
enne (OOO)
2014/05/27 23:44:13
This is the equivalent of WebViewImpl::setRootGrap
ojan
2014/05/27 23:54:35
This is called with false in this file unfortunate
| |
| 210 // just used to set forceCompositingMode before we removed that setting. | |
| 211 // crbug.com/378029 | |
| 209 if (m_isAcceleratedCompositingActive == enter) | 212 if (m_isAcceleratedCompositingActive == enter) |
| 210 return; | 213 return; |
| 211 | 214 |
| 212 if (!enter) { | 215 if (!enter) { |
| 213 m_isAcceleratedCompositingActive = false; | 216 m_isAcceleratedCompositingActive = false; |
| 214 m_client->didDeactivateCompositor(); | 217 m_client->didDeactivateCompositor(); |
| 215 } else if (m_layerTreeView) { | 218 } else if (m_layerTreeView) { |
| 216 m_isAcceleratedCompositingActive = true; | 219 m_isAcceleratedCompositingActive = true; |
| 217 m_client->didActivateCompositor(); | 220 m_client->didActivateCompositor(); |
| 218 } else { | 221 } else { |
| (...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 441 ASSERT(widget == m_widget); | 444 ASSERT(widget == m_widget); |
| 442 if (m_widget) { | 445 if (m_widget) { |
| 443 m_widget->setClient(0); | 446 m_widget->setClient(0); |
| 444 m_widget = 0; | 447 m_widget = 0; |
| 445 } | 448 } |
| 446 if (m_client) | 449 if (m_client) |
| 447 m_client->closeWidgetSoon(); | 450 m_client->closeWidgetSoon(); |
| 448 } | 451 } |
| 449 | 452 |
| 450 } // namespace blink | 453 } // namespace blink |
| OLD | NEW |