| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 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 374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 385 // not take the user away from the current page. | 385 // not take the user away from the current page. |
| 386 void didCommitLoad(bool isNewNavigation, bool isNavigationWithinPage); | 386 void didCommitLoad(bool isNewNavigation, bool isNavigationWithinPage); |
| 387 | 387 |
| 388 // Indicates two things: | 388 // Indicates two things: |
| 389 // 1) This view may have a new layout now. | 389 // 1) This view may have a new layout now. |
| 390 // 2) Calling layout() is a no-op. | 390 // 2) Calling layout() is a no-op. |
| 391 // After calling WebWidget::layout(), expect to get this notification | 391 // After calling WebWidget::layout(), expect to get this notification |
| 392 // unless the view did not need a layout. | 392 // unless the view did not need a layout. |
| 393 void layoutUpdated(WebFrameImpl*); | 393 void layoutUpdated(WebFrameImpl*); |
| 394 | 394 |
| 395 void willInsertBody(WebFrameImpl*); |
| 395 void didChangeContentsSize(); | 396 void didChangeContentsSize(); |
| 396 void deviceOrPageScaleFactorChanged(); | 397 void deviceOrPageScaleFactorChanged(); |
| 397 | 398 |
| 398 // Returns true if popup menus should be rendered by the browser, false if | 399 // Returns true if popup menus should be rendered by the browser, false if |
| 399 // they should be rendered by WebKit (which is the default). | 400 // they should be rendered by WebKit (which is the default). |
| 400 static bool useExternalPopupMenus(); | 401 static bool useExternalPopupMenus(); |
| 401 | 402 |
| 402 bool contextMenuAllowed() const | 403 bool contextMenuAllowed() const |
| 403 { | 404 { |
| 404 return m_contextMenuAllowed; | 405 return m_contextMenuAllowed; |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 526 WebCore::IntPoint clampOffsetAtScale(const WebCore::IntPoint& offset, float
scale); | 527 WebCore::IntPoint clampOffsetAtScale(const WebCore::IntPoint& offset, float
scale); |
| 527 | 528 |
| 528 // Exposed for tests. | 529 // Exposed for tests. |
| 529 WebVector<WebCompositionUnderline> compositionUnderlines() const; | 530 WebVector<WebCompositionUnderline> compositionUnderlines() const; |
| 530 | 531 |
| 531 WebLayerTreeView* layerTreeView() const { return m_layerTreeView; } | 532 WebLayerTreeView* layerTreeView() const { return m_layerTreeView; } |
| 532 | 533 |
| 533 private: | 534 private: |
| 534 float legibleScale() const; | 535 float legibleScale() const; |
| 535 void refreshPageScaleFactorAfterLayout(); | 536 void refreshPageScaleFactorAfterLayout(); |
| 537 void resumeTreeViewCommits(); |
| 536 void setUserAgentPageScaleConstraints(WebCore::PageScaleConstraints newConst
raints); | 538 void setUserAgentPageScaleConstraints(WebCore::PageScaleConstraints newConst
raints); |
| 537 float clampPageScaleFactorToLimits(float) const; | 539 float clampPageScaleFactorToLimits(float) const; |
| 538 WebCore::IntSize contentsSize() const; | 540 WebCore::IntSize contentsSize() const; |
| 539 | 541 |
| 540 void resetSavedScrollAndScaleState(); | 542 void resetSavedScrollAndScaleState(); |
| 541 | 543 |
| 542 void updateMainFrameScrollPosition(const WebCore::IntPoint& scrollPosition,
bool programmaticScroll); | 544 void updateMainFrameScrollPosition(const WebCore::IntPoint& scrollPosition,
bool programmaticScroll); |
| 543 | 545 |
| 544 friend class WebView; // So WebView::Create can call our constructor | 546 friend class WebView; // So WebView::Create can call our constructor |
| 545 friend class WTF::RefCounted<WebViewImpl>; | 547 friend class WTF::RefCounted<WebViewImpl>; |
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 783 Vector<WebHelperPluginImpl*> m_helperPluginsPendingClose; | 785 Vector<WebHelperPluginImpl*> m_helperPluginsPendingClose; |
| 784 }; | 786 }; |
| 785 | 787 |
| 786 // We have no ways to check if the specified WebView is an instance of | 788 // We have no ways to check if the specified WebView is an instance of |
| 787 // WebViewImpl because WebViewImpl is the only implementation of WebView. | 789 // WebViewImpl because WebViewImpl is the only implementation of WebView. |
| 788 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true); | 790 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true); |
| 789 | 791 |
| 790 } // namespace blink | 792 } // namespace blink |
| 791 | 793 |
| 792 #endif | 794 #endif |
| OLD | NEW |