| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). | 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 285 return; | 285 return; |
| 286 | 286 |
| 287 WebNavigationPolicy policy = static_cast<WebNavigationPolicy>(navigationPoli
cy); | 287 WebNavigationPolicy policy = static_cast<WebNavigationPolicy>(navigationPoli
cy); |
| 288 if (policy == WebNavigationPolicyIgnore) | 288 if (policy == WebNavigationPolicyIgnore) |
| 289 policy = getNavigationPolicy(m_windowFeatures); | 289 policy = getNavigationPolicy(m_windowFeatures); |
| 290 else if (policy == WebNavigationPolicyNewBackgroundTab && getNavigationPolic
y(m_windowFeatures) != WebNavigationPolicyNewBackgroundTab) | 290 else if (policy == WebNavigationPolicyNewBackgroundTab && getNavigationPolic
y(m_windowFeatures) != WebNavigationPolicyNewBackgroundTab) |
| 291 policy = WebNavigationPolicyNewForegroundTab; | 291 policy = WebNavigationPolicyNewForegroundTab; |
| 292 m_webView->client()->show(policy); | 292 m_webView->client()->show(policy); |
| 293 } | 293 } |
| 294 | 294 |
| 295 void ChromeClientImpl::didOverScrollOnMainThread(FloatPoint& unusedDelta, FloatP
oint& accumulatedRootOverScroll, FloatPoint& position, FloatPoint& velocity) |
| 296 { |
| 297 if (!m_webView->client()) |
| 298 return; |
| 299 |
| 300 m_webView->client()->didOverScrollOnMainThread(unusedDelta.x(), unusedDelta.
y(), accumulatedRootOverScroll.x(), accumulatedRootOverScroll.y(), position.x(),
position.y(), velocity.x(), velocity.y()); |
| 301 } |
| 302 |
| 295 void ChromeClientImpl::setToolbarsVisible(bool value) | 303 void ChromeClientImpl::setToolbarsVisible(bool value) |
| 296 { | 304 { |
| 297 m_windowFeatures.toolBarVisible = value; | 305 m_windowFeatures.toolBarVisible = value; |
| 298 } | 306 } |
| 299 | 307 |
| 300 bool ChromeClientImpl::toolbarsVisible() | 308 bool ChromeClientImpl::toolbarsVisible() |
| 301 { | 309 { |
| 302 return m_windowFeatures.toolBarVisible; | 310 return m_windowFeatures.toolBarVisible; |
| 303 } | 311 } |
| 304 | 312 |
| (...skipping 605 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 910 if (m_webView->rootGraphicsLayer() && m_webView->layerTreeView()) | 918 if (m_webView->rootGraphicsLayer() && m_webView->layerTreeView()) |
| 911 m_webView->page()->frameHost().pinchViewport().registerLayersWithTreeVie
w(m_webView->layerTreeView()); | 919 m_webView->page()->frameHost().pinchViewport().registerLayersWithTreeVie
w(m_webView->layerTreeView()); |
| 912 } | 920 } |
| 913 | 921 |
| 914 void ChromeClientImpl::didUpdateTopControls() const | 922 void ChromeClientImpl::didUpdateTopControls() const |
| 915 { | 923 { |
| 916 m_webView->didUpdateTopControls(); | 924 m_webView->didUpdateTopControls(); |
| 917 } | 925 } |
| 918 | 926 |
| 919 } // namespace blink | 927 } // namespace blink |
| OLD | NEW |