Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(217)

Side by Side Diff: Source/web/ChromeClientImpl.cpp

Issue 919423002: Audited and renamed uses of methods and variables named RootView (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Build fix Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 480 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 { 491 {
492 ASSERT(WebLocalFrameImpl::fromFrame(localRoot)); 492 ASSERT(WebLocalFrameImpl::fromFrame(localRoot));
493 // If the frame is still being created, it might not yet have a WebWidget. 493 // If the frame is still being created, it might not yet have a WebWidget.
494 // FIXME: Is this the right thing to do? Is there a way to avoid having 494 // FIXME: Is this the right thing to do? Is there a way to avoid having
495 // a local frame root that doesn't have a WebWidget? During initialization 495 // a local frame root that doesn't have a WebWidget? During initialization
496 // there is no content to draw so this call serves no purpose. 496 // there is no content to draw so this call serves no purpose.
497 if (WebLocalFrameImpl::fromFrame(localRoot)->frameWidget()) 497 if (WebLocalFrameImpl::fromFrame(localRoot)->frameWidget())
498 WebLocalFrameImpl::fromFrame(localRoot)->frameWidget()->scheduleAnimatio n(); 498 WebLocalFrameImpl::fromFrame(localRoot)->frameWidget()->scheduleAnimatio n();
499 } 499 }
500 500
501 IntRect ChromeClientImpl::rootViewToScreen(const IntRect& rect) const 501 IntRect ChromeClientImpl::viewportToScreen(const IntRect& rectInViewport) const
502 { 502 {
503 IntRect screenRect(rect); 503 IntRect screenRect(rectInViewport);
504 504
505 if (m_webView->client()) { 505 if (m_webView->client()) {
506 WebRect windowRect = m_webView->client()->windowRect(); 506 WebRect windowRect = m_webView->client()->windowRect();
507 screenRect.move(windowRect.x, windowRect.y); 507 screenRect.move(windowRect.x, windowRect.y);
508 } 508 }
509 509
510 return screenRect; 510 return screenRect;
511 } 511 }
512 512
513 WebScreenInfo ChromeClientImpl::screenInfo() const 513 WebScreenInfo ChromeClientImpl::screenInfo() const
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
748 { 748 {
749 if (WebViewImpl::useExternalPopupMenus()) 749 if (WebViewImpl::useExternalPopupMenus())
750 return adoptRefWillBeNoop(new ExternalPopupMenu(frame, client, *m_webVie w)); 750 return adoptRefWillBeNoop(new ExternalPopupMenu(frame, client, *m_webVie w));
751 751
752 if (RuntimeEnabledFeatures::htmlPopupMenuEnabled() && RuntimeEnabledFeatures ::pagePopupEnabled()) 752 if (RuntimeEnabledFeatures::htmlPopupMenuEnabled() && RuntimeEnabledFeatures ::pagePopupEnabled())
753 return PopupMenuImpl::create(this, client); 753 return PopupMenuImpl::create(this, client);
754 754
755 return adoptRefWillBeNoop(new PopupMenuChromium(frame, client)); 755 return adoptRefWillBeNoop(new PopupMenuChromium(frame, client));
756 } 756 }
757 757
758 PagePopup* ChromeClientImpl::openPagePopup(PagePopupClient* client, const IntRec t& originBoundsInRootView) 758 PagePopup* ChromeClientImpl::openPagePopup(PagePopupClient* client)
759 { 759 {
760 return m_webView->openPagePopup(client, originBoundsInRootView); 760 return m_webView->openPagePopup(client);
761 } 761 }
762 762
763 void ChromeClientImpl::closePagePopup(PagePopup* popup) 763 void ChromeClientImpl::closePagePopup(PagePopup* popup)
764 { 764 {
765 m_webView->closePagePopup(popup); 765 m_webView->closePagePopup(popup);
766 } 766 }
767 767
768 DOMWindow* ChromeClientImpl::pagePopupWindowForTesting() const 768 DOMWindow* ChromeClientImpl::pagePopupWindowForTesting() const
769 { 769 {
770 return m_webView->pagePopupWindow(); 770 return m_webView->pagePopupWindow();
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
890 webframe->autofillClient()->dataListOptionsChanged(WebInputElement(&inpu t)); 890 webframe->autofillClient()->dataListOptionsChanged(WebInputElement(&inpu t));
891 } 891 }
892 892
893 void ChromeClientImpl::registerViewportLayers() const 893 void ChromeClientImpl::registerViewportLayers() const
894 { 894 {
895 if (m_webView->rootGraphicsLayer() && m_webView->layerTreeView() && m_webVie w->pinchVirtualViewportEnabled()) 895 if (m_webView->rootGraphicsLayer() && m_webView->layerTreeView() && m_webVie w->pinchVirtualViewportEnabled())
896 m_webView->page()->frameHost().pinchViewport().registerLayersWithTreeVie w(m_webView->layerTreeView()); 896 m_webView->page()->frameHost().pinchViewport().registerLayersWithTreeVie w(m_webView->layerTreeView());
897 } 897 }
898 898
899 } // namespace blink 899 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698