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

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

Issue 765903002: Remove internals.setEnableMockPagePopup(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years 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 | Annotate | Revision Log
« no previous file with comments | « Source/web/WebViewImpl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1574 matching lines...) Expand 10 before | Expand all | Expand 10 after
1585 { 1585 {
1586 ASSERT(popup); 1586 ASSERT(popup);
1587 WebPagePopupImpl* popupImpl = toWebPagePopupImpl(popup); 1587 WebPagePopupImpl* popupImpl = toWebPagePopupImpl(popup);
1588 ASSERT(m_pagePopup.get() == popupImpl); 1588 ASSERT(m_pagePopup.get() == popupImpl);
1589 if (m_pagePopup.get() != popupImpl) 1589 if (m_pagePopup.get() != popupImpl)
1590 return; 1590 return;
1591 m_pagePopup->closePopup(); 1591 m_pagePopup->closePopup();
1592 m_pagePopup = nullptr; 1592 m_pagePopup = nullptr;
1593 } 1593 }
1594 1594
1595 LocalDOMWindow* WebViewImpl::pagePopupWindow() 1595 LocalDOMWindow* WebViewImpl::pagePopupWindow() const
1596 { 1596 {
1597 return m_pagePopup ? m_pagePopup->window() : nullptr; 1597 return m_pagePopup ? m_pagePopup->window() : nullptr;
1598 } 1598 }
1599 1599
1600 Frame* WebViewImpl::focusedCoreFrame() const 1600 Frame* WebViewImpl::focusedCoreFrame() const
1601 { 1601 {
1602 return m_page ? m_page->focusController().focusedOrMainFrame() : 0; 1602 return m_page ? m_page->focusController().focusedOrMainFrame() : 0;
1603 } 1603 }
1604 1604
1605 WebViewImpl* WebViewImpl::fromPage(Page* page) 1605 WebViewImpl* WebViewImpl::fromPage(Page* page)
(...skipping 2945 matching lines...) Expand 10 before | Expand all | Expand 10 after
4551 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width 4551 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
4552 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); 4552 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1);
4553 } 4553 }
4554 4554
4555 void WebViewImpl::forceNextWebGLContextCreationToFail() 4555 void WebViewImpl::forceNextWebGLContextCreationToFail()
4556 { 4556 {
4557 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); 4557 WebGLRenderingContext::forceNextWebGLContextCreationToFail();
4558 } 4558 }
4559 4559
4560 } // namespace blink 4560 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/WebViewImpl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698