| 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 531 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 542 IntRect screenRect(rect); | 542 IntRect screenRect(rect); |
| 543 | 543 |
| 544 if (m_webView->client()) { | 544 if (m_webView->client()) { |
| 545 WebRect windowRect = m_webView->client()->windowRect(); | 545 WebRect windowRect = m_webView->client()->windowRect(); |
| 546 screenRect.move(windowRect.x, windowRect.y); | 546 screenRect.move(windowRect.x, windowRect.y); |
| 547 } | 547 } |
| 548 | 548 |
| 549 return screenRect; | 549 return screenRect; |
| 550 } | 550 } |
| 551 | 551 |
| 552 void ChromeClientImpl::layoutBeforeScrollbarUpdate(WebCore::Frame* frame) |
| 553 { |
| 554 if (m_webView->mainFrameImpl()->frame() != frame) |
| 555 return; |
| 556 |
| 557 m_webView->layoutBeforeScrollbarUpdate(); |
| 558 } |
| 559 |
| 552 void ChromeClientImpl::contentsSizeChanged(Frame* frame, const IntSize& size) co
nst | 560 void ChromeClientImpl::contentsSizeChanged(Frame* frame, const IntSize& size) co
nst |
| 553 { | 561 { |
| 554 WebFrameImpl* webframe = WebFrameImpl::fromFrame(frame); | 562 WebFrameImpl* webframe = WebFrameImpl::fromFrame(frame); |
| 555 if (webframe->client()) | 563 if (webframe->client()) |
| 556 webframe->client()->didChangeContentsSize(webframe, size); | 564 webframe->client()->didChangeContentsSize(webframe, size); |
| 557 } | 565 } |
| 558 | 566 |
| 559 void ChromeClientImpl::layoutUpdated(Frame* frame) const | 567 void ChromeClientImpl::layoutUpdated(Frame* frame) const |
| 560 { | 568 { |
| 561 WebFrameImpl* webframe = WebFrameImpl::fromFrame(frame); | 569 m_webView->didUpdateLayout(WebFrameImpl::fromFrame(frame)); |
| 562 if (webframe->client()) | |
| 563 webframe->client()->didUpdateLayout(webframe); | |
| 564 } | 570 } |
| 565 | 571 |
| 566 void ChromeClientImpl::scrollbarsModeDidChange() const | 572 void ChromeClientImpl::scrollbarsModeDidChange() const |
| 567 { | 573 { |
| 568 } | 574 } |
| 569 | 575 |
| 570 void ChromeClientImpl::mouseDidMoveOverElement( | 576 void ChromeClientImpl::mouseDidMoveOverElement( |
| 571 const HitTestResult& result, unsigned modifierFlags) | 577 const HitTestResult& result, unsigned modifierFlags) |
| 572 { | 578 { |
| 573 if (!m_webView->client()) | 579 if (!m_webView->client()) |
| (...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 941 ASSERT_NOT_REACHED(); | 947 ASSERT_NOT_REACHED(); |
| 942 return true; | 948 return true; |
| 943 } | 949 } |
| 944 | 950 |
| 945 void ChromeClientImpl::numWheelEventHandlersChanged(unsigned numberOfWheelHandle
rs) | 951 void ChromeClientImpl::numWheelEventHandlersChanged(unsigned numberOfWheelHandle
rs) |
| 946 { | 952 { |
| 947 m_webView->numberOfWheelEventHandlersChanged(numberOfWheelHandlers); | 953 m_webView->numberOfWheelEventHandlersChanged(numberOfWheelHandlers); |
| 948 } | 954 } |
| 949 | 955 |
| 950 } // namespace WebKit | 956 } // namespace WebKit |
| OLD | NEW |