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

Side by Side Diff: Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.cpp

Issue 9950115: Revert 111028 - Support W3C Full Screen API proposal (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/
Patch Set: Created 8 years, 8 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 Apple Inc. All rights reserved. 2 * Copyright (C) 2011 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 void WebFullScreenManager::enterFullScreenForElement(WebCore::Element* element) 94 void WebFullScreenManager::enterFullScreenForElement(WebCore::Element* element)
95 { 95 {
96 ASSERT(element); 96 ASSERT(element);
97 m_element = element; 97 m_element = element;
98 m_initialFrame = screenRectOfContents(m_element.get()); 98 m_initialFrame = screenRectOfContents(m_element.get());
99 m_page->injectedBundleFullScreenClient().enterFullScreenForElement(m_page.ge t(), element); 99 m_page->injectedBundleFullScreenClient().enterFullScreenForElement(m_page.ge t(), element);
100 } 100 }
101 101
102 void WebFullScreenManager::exitFullScreenForElement(WebCore::Element* element) 102 void WebFullScreenManager::exitFullScreenForElement(WebCore::Element* element)
103 { 103 {
104 ASSERT(element);
105 ASSERT(m_element == element);
104 m_page->injectedBundleFullScreenClient().exitFullScreenForElement(m_page.get (), element); 106 m_page->injectedBundleFullScreenClient().exitFullScreenForElement(m_page.get (), element);
105 } 107 }
106 108
107 void WebFullScreenManager::willEnterFullScreen() 109 void WebFullScreenManager::willEnterFullScreen()
108 { 110 {
109 ASSERT(m_element); 111 ASSERT(m_element);
110 m_element->document()->webkitWillEnterFullScreenForElement(m_element.get()); 112 m_element->document()->webkitWillEnterFullScreenForElement(m_element.get());
111 m_element->document()->updateLayout(); 113 m_element->document()->updateLayout();
112 m_page->forceRepaintWithoutCallback(); 114 m_page->forceRepaintWithoutCallback();
113 m_finalFrame = screenRectOfContents(m_element.get()); 115 m_finalFrame = screenRectOfContents(m_element.get());
(...skipping 22 matching lines...) Expand all
136 138
137 void WebFullScreenManager::setAnimatingFullScreen(bool animating) 139 void WebFullScreenManager::setAnimatingFullScreen(bool animating)
138 { 140 {
139 ASSERT(m_element); 141 ASSERT(m_element);
140 m_element->document()->setAnimatingFullScreen(animating); 142 m_element->document()->setAnimatingFullScreen(animating);
141 } 143 }
142 144
143 } // namespace WebKit 145 } // namespace WebKit
144 146
145 #endif // ENABLE(FULLSCREEN_API) 147 #endif // ENABLE(FULLSCREEN_API)
OLDNEW
« no previous file with comments | « Source/WebKit2/UIProcess/WebFullScreenManagerProxy.cpp ('k') | Tools/DumpRenderTree/mac/UIDelegate.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698