| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2011, 2012 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 3350 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3361 return m_dragOperation; | 3361 return m_dragOperation; |
| 3362 } | 3362 } |
| 3363 | 3363 |
| 3364 void WebViewImpl::sendResizeEventAndRepaint() | 3364 void WebViewImpl::sendResizeEventAndRepaint() |
| 3365 { | 3365 { |
| 3366 // FIXME: This is wrong. The FrameView is responsible sending a resizeEvent | 3366 // FIXME: This is wrong. The FrameView is responsible sending a resizeEvent |
| 3367 // as part of layout. Layout is also responsible for sending invalidations | 3367 // as part of layout. Layout is also responsible for sending invalidations |
| 3368 // to the embedder. This method and all callers may be wrong. -- eseidel. | 3368 // to the embedder. This method and all callers may be wrong. -- eseidel. |
| 3369 if (mainFrameImpl()->frameView()) { | 3369 if (mainFrameImpl()->frameView()) { |
| 3370 // Enqueues the resize event. | 3370 // Enqueues the resize event. |
| 3371 mainFrameImpl()->frame()->eventHandler().sendResizeEvent(); | 3371 mainFrameImpl()->frame()->document()->enqueueResizeEvent(); |
| 3372 } | 3372 } |
| 3373 | 3373 |
| 3374 if (m_client) { | 3374 if (m_client) { |
| 3375 if (isAcceleratedCompositingActive()) { | 3375 if (isAcceleratedCompositingActive()) { |
| 3376 updateLayerTreeViewport(); | 3376 updateLayerTreeViewport(); |
| 3377 } else { | 3377 } else { |
| 3378 WebRect damagedRect(0, 0, m_size.width, m_size.height); | 3378 WebRect damagedRect(0, 0, m_size.width, m_size.height); |
| 3379 m_client->didInvalidateRect(damagedRect); | 3379 m_client->didInvalidateRect(damagedRect); |
| 3380 } | 3380 } |
| 3381 } | 3381 } |
| (...skipping 797 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4179 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); | 4179 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); |
| 4180 | 4180 |
| 4181 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 4181 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
| 4182 return false; | 4182 return false; |
| 4183 | 4183 |
| 4184 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4184 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
| 4185 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4185 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
| 4186 } | 4186 } |
| 4187 | 4187 |
| 4188 } // namespace blink | 4188 } // namespace blink |
| OLD | NEW |