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

Side by Side Diff: Source/WebKit/win/WebView.cpp

Issue 7497054: Merge 92347 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/
Patch Set: Created 9 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
« no previous file with comments | « Source/WebKit/mac/WebView/WebFullScreenController.mm ('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) 2006, 2007, 2008, 2009, 2010 Apple, Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple, Inc. All rights reserved.
3 * Copyright (C) 2009, 2010, 2011 Appcelerator, Inc. All rights reserved. 3 * Copyright (C) 2009, 2010, 2011 Appcelerator, Inc. All rights reserved.
4 * Copyright (C) 2011 Brent Fulgham. All rights reserved. 4 * Copyright (C) 2011 Brent Fulgham. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. 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 6113 matching lines...) Expand 10 before | Expand all | Expand 10 after
6124 return String(bstr, SysStringLen(bstr)); 6124 return String(bstr, SysStringLen(bstr));
6125 } 6125 }
6126 6126
6127 static KURL toKURL(BSTR bstr) 6127 static KURL toKURL(BSTR bstr)
6128 { 6128 {
6129 return KURL(KURL(), toString(bstr)); 6129 return KURL(KURL(), toString(bstr));
6130 } 6130 }
6131 6131
6132 void WebView::enterFullscreenForNode(Node* node) 6132 void WebView::enterFullscreenForNode(Node* node)
6133 { 6133 {
6134 if (!node->hasTagName(HTMLNames::videoTag)) 6134 if (!node->hasTagName(HTMLNames::videoTag) || !node->isElementNode() || !sta tic_cast<Element*>(node)->isMediaElement())
6135 return; 6135 return;
6136 6136
6137 #if ENABLE(VIDEO) 6137 #if ENABLE(VIDEO)
6138 HTMLMediaElement* videoElement = static_cast<HTMLMediaElement*>(node); 6138 HTMLMediaElement* videoElement = static_cast<HTMLMediaElement*>(node);
6139 6139
6140 if (m_fullScreenVideoController) { 6140 if (m_fullScreenVideoController) {
6141 if (m_fullScreenVideoController->mediaElement() == videoElement) { 6141 if (m_fullScreenVideoController->mediaElement() == videoElement) {
6142 // The backend may just warn us that the underlaying plaftormMovie() 6142 // The backend may just warn us that the underlaying plaftormMovie()
6143 // has changed. Just force an update. 6143 // has changed. Just force an update.
6144 m_fullScreenVideoController->setMediaElement(videoElement); 6144 m_fullScreenVideoController->setMediaElement(videoElement);
(...skipping 703 matching lines...) Expand 10 before | Expand all | Expand 10 after
6848 void WebView::fullScreenClientForceRepaint() 6848 void WebView::fullScreenClientForceRepaint()
6849 { 6849 {
6850 ASSERT(m_fullScreenElement); 6850 ASSERT(m_fullScreenElement);
6851 RECT windowRect = {0}; 6851 RECT windowRect = {0};
6852 frameRect(&windowRect); 6852 frameRect(&windowRect);
6853 repaint(windowRect, true /*contentChanged*/, true /*immediate*/, false /*con tentOnly*/); 6853 repaint(windowRect, true /*contentChanged*/, true /*immediate*/, false /*con tentOnly*/);
6854 m_fullscreenController->repaintCompleted(); 6854 m_fullscreenController->repaintCompleted();
6855 } 6855 }
6856 6856
6857 #endif 6857 #endif
OLDNEW
« no previous file with comments | « Source/WebKit/mac/WebView/WebFullScreenController.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698