| 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 1934 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1945 | 1945 |
| 1946 void WebViewImpl::resize(const WebSize& newSize) | 1946 void WebViewImpl::resize(const WebSize& newSize) |
| 1947 { | 1947 { |
| 1948 if (m_shouldAutoResize || m_size == newSize) | 1948 if (m_shouldAutoResize || m_size == newSize) |
| 1949 return; | 1949 return; |
| 1950 | 1950 |
| 1951 resizeWithTopControls( | 1951 resizeWithTopControls( |
| 1952 newSize, topControls().height(), topControls().shrinkViewport()); | 1952 newSize, topControls().height(), topControls().shrinkViewport()); |
| 1953 } | 1953 } |
| 1954 | 1954 |
| 1955 void WebViewImpl::didEnterFullScreen() | 1955 void WebViewImpl::didEnterFullscreen() |
| 1956 { | 1956 { |
| 1957 m_fullscreenController->didEnterFullScreen(); | 1957 m_fullscreenController->didEnterFullscreen(); |
| 1958 } | 1958 } |
| 1959 | 1959 |
| 1960 void WebViewImpl::didExitFullScreen() | 1960 void WebViewImpl::didExitFullscreen() |
| 1961 { | 1961 { |
| 1962 m_fullscreenController->didExitFullScreen(); | 1962 m_fullscreenController->didExitFullscreen(); |
| 1963 } | 1963 } |
| 1964 | 1964 |
| 1965 void WebViewImpl::didUpdateFullScreenSize() | 1965 void WebViewImpl::didUpdateFullScreenSize() |
| 1966 { | 1966 { |
| 1967 m_fullscreenController->updateSize(); | 1967 m_fullscreenController->updateSize(); |
| 1968 } | 1968 } |
| 1969 | 1969 |
| 1970 void WebViewImpl::beginFrame(double lastFrameTimeMonotonic) | 1970 void WebViewImpl::beginFrame(double lastFrameTimeMonotonic) |
| 1971 { | 1971 { |
| 1972 TRACE_EVENT1("blink", "WebViewImpl::beginFrame", "frameTime", lastFrameTimeM
onotonic); | 1972 TRACE_EVENT1("blink", "WebViewImpl::beginFrame", "frameTime", lastFrameTimeM
onotonic); |
| (...skipping 2596 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4569 { | 4569 { |
| 4570 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa
ctor rather than | 4570 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa
ctor rather than |
| 4571 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. | 4571 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. |
| 4572 if (!page()) | 4572 if (!page()) |
| 4573 return 1; | 4573 return 1; |
| 4574 | 4574 |
| 4575 return page()->deviceScaleFactor(); | 4575 return page()->deviceScaleFactor(); |
| 4576 } | 4576 } |
| 4577 | 4577 |
| 4578 } // namespace blink | 4578 } // namespace blink |
| OLD | NEW |