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

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

Issue 485953003: Make Fullscreen::fullyExitFullscreen() static (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « Source/web/FullscreenController.cpp ('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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 void WebDocument::watchCSSSelectors(const WebVector<WebString>& webSelectors) 220 void WebDocument::watchCSSSelectors(const WebVector<WebString>& webSelectors)
221 { 221 {
222 RefPtrWillBeRawPtr<Document> document = unwrap<Document>(); 222 RefPtrWillBeRawPtr<Document> document = unwrap<Document>();
223 Vector<String> selectors; 223 Vector<String> selectors;
224 selectors.append(webSelectors.data(), webSelectors.size()); 224 selectors.append(webSelectors.data(), webSelectors.size());
225 CSSSelectorWatch::from(*document).watchCSSSelectors(selectors); 225 CSSSelectorWatch::from(*document).watchCSSSelectors(selectors);
226 } 226 }
227 227
228 void WebDocument::cancelFullScreen() 228 void WebDocument::cancelFullScreen()
229 { 229 {
230 if (Fullscreen* fullscreen = Fullscreen::fromIfExists(*unwrap<Document>())) 230 Fullscreen::fullyExitFullscreen(*unwrap<Document>());
231 fullscreen->fullyExitFullscreen();
232 } 231 }
233 232
234 WebElement WebDocument::fullScreenElement() const 233 WebElement WebDocument::fullScreenElement() const
235 { 234 {
236 Element* fullScreenElement = 0; 235 Element* fullScreenElement = 0;
237 if (Fullscreen* fullscreen = Fullscreen::fromIfExists(*const_cast<WebDocumen t*>(this)->unwrap<Document>())) 236 if (Fullscreen* fullscreen = Fullscreen::fromIfExists(*const_cast<WebDocumen t*>(this)->unwrap<Document>()))
238 fullScreenElement = fullscreen->webkitCurrentFullScreenElement(); 237 fullScreenElement = fullscreen->webkitCurrentFullScreenElement();
239 return WebElement(fullScreenElement); 238 return WebElement(fullScreenElement);
240 } 239 }
241 240
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 m_private = elem; 325 m_private = elem;
327 return *this; 326 return *this;
328 } 327 }
329 328
330 WebDocument::operator PassRefPtrWillBeRawPtr<Document>() const 329 WebDocument::operator PassRefPtrWillBeRawPtr<Document>() const
331 { 330 {
332 return toDocument(m_private.get()); 331 return toDocument(m_private.get());
333 } 332 }
334 333
335 } // namespace blink 334 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/FullscreenController.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698