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

Side by Side Diff: Source/web/WebViewImpl.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) 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 1568 matching lines...) Expand 10 before | Expand all | Expand 10 after
1579 m_selectPopup = nullptr; 1579 m_selectPopup = nullptr;
1580 ASSERT(mainFrameImpl()->frame()->document()); 1580 ASSERT(mainFrameImpl()->frame()->document());
1581 Document& document = *mainFrameImpl()->frame()->document(); 1581 Document& document = *mainFrameImpl()->frame()->document();
1582 // Remove the handler we added in |popupOpened| conditionally, because the 1582 // Remove the handler we added in |popupOpened| conditionally, because the
1583 // Document may have already removed it, for instance, due to a navigation. 1583 // Document may have already removed it, for instance, due to a navigation.
1584 EventHandlerRegistry* registry = &document.frameHost()->eventHandlerRegistry (); 1584 EventHandlerRegistry* registry = &document.frameHost()->eventHandlerRegistry ();
1585 if (registry->eventHandlerTargets(EventHandlerRegistry::WheelEvent)->contain s(&document)) 1585 if (registry->eventHandlerTargets(EventHandlerRegistry::WheelEvent)->contain s(&document))
1586 registry->didRemoveEventHandler(document, EventHandlerRegistry::WheelEve nt); 1586 registry->didRemoveEventHandler(document, EventHandlerRegistry::WheelEve nt);
1587 } 1587 }
1588 1588
1589 PagePopup* WebViewImpl::openPagePopup(PagePopupClient* client, const IntRect& or iginBoundsInRootView) 1589 PagePopup* WebViewImpl::openPagePopup(PagePopupClient* client)
1590 { 1590 {
1591 ASSERT(client); 1591 ASSERT(client);
1592 if (hasOpenedPopup()) 1592 if (hasOpenedPopup())
1593 hidePopups(); 1593 hidePopups();
1594 ASSERT(!m_pagePopup); 1594 ASSERT(!m_pagePopup);
1595 1595
1596 WebWidget* popupWidget = m_client->createPopupMenu(WebPopupTypePage); 1596 WebWidget* popupWidget = m_client->createPopupMenu(WebPopupTypePage);
1597 ASSERT(popupWidget); 1597 ASSERT(popupWidget);
1598 m_pagePopup = toWebPagePopupImpl(popupWidget); 1598 m_pagePopup = toWebPagePopupImpl(popupWidget);
1599 if (!m_pagePopup->initialize(this, client, originBoundsInRootView)) { 1599 if (!m_pagePopup->initialize(this, client)) {
1600 m_pagePopup->closePopup(); 1600 m_pagePopup->closePopup();
1601 m_pagePopup = nullptr; 1601 m_pagePopup = nullptr;
1602 } 1602 }
1603 return m_pagePopup.get(); 1603 return m_pagePopup.get();
1604 } 1604 }
1605 1605
1606 void WebViewImpl::closePagePopup(PagePopup* popup) 1606 void WebViewImpl::closePagePopup(PagePopup* popup)
1607 { 1607 {
1608 ASSERT(popup); 1608 ASSERT(popup);
1609 WebPagePopupImpl* popupImpl = toWebPagePopupImpl(popup); 1609 WebPagePopupImpl* popupImpl = toWebPagePopupImpl(popup);
(...skipping 3004 matching lines...) Expand 10 before | Expand all | Expand 10 after
4614 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width 4614 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
4615 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); 4615 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1);
4616 } 4616 }
4617 4617
4618 void WebViewImpl::forceNextWebGLContextCreationToFail() 4618 void WebViewImpl::forceNextWebGLContextCreationToFail()
4619 { 4619 {
4620 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); 4620 WebGLRenderingContext::forceNextWebGLContextCreationToFail();
4621 } 4621 }
4622 4622
4623 } // namespace blink 4623 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698