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

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

Issue 351213007: Ensure that the controls attribute is correctly reflected in JS. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 5 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 3111 matching lines...) Expand 10 before | Expand all | Expand 10 after
3122 else 3122 else
3123 mediaElement->pause(); 3123 mediaElement->pause();
3124 break; 3124 break;
3125 case WebMediaPlayerAction::Mute: 3125 case WebMediaPlayerAction::Mute:
3126 mediaElement->setMuted(action.enable); 3126 mediaElement->setMuted(action.enable);
3127 break; 3127 break;
3128 case WebMediaPlayerAction::Loop: 3128 case WebMediaPlayerAction::Loop:
3129 mediaElement->setLoop(action.enable); 3129 mediaElement->setLoop(action.enable);
3130 break; 3130 break;
3131 case WebMediaPlayerAction::Controls: 3131 case WebMediaPlayerAction::Controls:
3132 mediaElement->setControls(action.enable); 3132 mediaElement->setBooleanAttribute(HTMLNames::controlsAttr, action.enable );
3133 break; 3133 break;
3134 default: 3134 default:
3135 ASSERT_NOT_REACHED(); 3135 ASSERT_NOT_REACHED();
3136 } 3136 }
3137 } 3137 }
3138 3138
3139 void WebViewImpl::performPluginAction(const WebPluginAction& action, 3139 void WebViewImpl::performPluginAction(const WebPluginAction& action,
3140 const WebPoint& location) 3140 const WebPoint& location)
3141 { 3141 {
3142 HitTestResult result = hitTestResultForWindowPos(location); 3142 HitTestResult result = hitTestResultForWindowPos(location);
(...skipping 1010 matching lines...) Expand 10 before | Expand all | Expand 10 after
4153 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); 4153 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints();
4154 4154
4155 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) 4155 if (!mainFrameImpl() || !mainFrameImpl()->frameView())
4156 return false; 4156 return false;
4157 4157
4158 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width 4158 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
4159 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); 4159 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1);
4160 } 4160 }
4161 4161
4162 } // namespace blink 4162 } // namespace blink
OLDNEW
« Source/core/html/HTMLMediaElement.h ('K') | « Source/web/ContextMenuClientImpl.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698