Chromium Code Reviews| Index: core/fxge/agg/fx_agg_driver.cpp |
| diff --git a/core/fxge/agg/fx_agg_driver.cpp b/core/fxge/agg/fx_agg_driver.cpp |
| index 98bce9b7c6f609ec97811392cd62ebd44a2cd3ff..988a5ec399f13c84b77b625875220bf3fa5d967e 100644 |
| --- a/core/fxge/agg/fx_agg_driver.cpp |
| +++ b/core/fxge/agg/fx_agg_driver.cpp |
| @@ -284,21 +284,21 @@ void CFX_AggDeviceDriver::SaveState() { |
| m_StateStack.Add(pClip); |
| } |
| -void CFX_AggDeviceDriver::RestoreState(FX_BOOL bKeepSaved) { |
| - if (m_StateStack.GetSize() == 0) { |
| - delete m_pClipRgn; |
| - m_pClipRgn = NULL; |
| - return; |
| - } |
| - CFX_ClipRgn* pSavedClip = m_StateStack[m_StateStack.GetSize() - 1]; |
| +void CFX_AggDeviceDriver::RestoreState(bool bKeepSaved) { |
| delete m_pClipRgn; |
|
Lei Zhang
2016/05/26 01:50:10
A little more cleanup here.
|
| - m_pClipRgn = NULL; |
| + m_pClipRgn = nullptr; |
| + |
| + int size = m_StateStack.GetSize(); |
| + if (!size) |
| + return; |
| + |
| + CFX_ClipRgn* pSavedClip = m_StateStack[size - 1]; |
| if (bKeepSaved) { |
| if (pSavedClip) { |
| m_pClipRgn = new CFX_ClipRgn(*pSavedClip); |
| } |
| } else { |
| - m_StateStack.RemoveAt(m_StateStack.GetSize() - 1); |
| + m_StateStack.RemoveAt(size - 1); |
| m_pClipRgn = pSavedClip; |
| } |
| } |