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

Side by Side Diff: Source/WebCore/platform/efl/RenderThemeEfl.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/WebCore/page/FrameView.cpp ('k') | Source/WebCore/platform/gtk/RenderThemeGtk.cpp » ('j') | 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) 2007 Apple Inc. 2 * Copyright (C) 2007 Apple Inc.
3 * Copyright (C) 2007 Alp Toker <alp@atoker.com> 3 * Copyright (C) 2007 Alp Toker <alp@atoker.com>
4 * Copyright (C) 2008 Collabora Ltd. 4 * Copyright (C) 2008 Collabora Ltd.
5 * Copyright (C) 2008 INdT - Instituto Nokia de Tecnologia 5 * Copyright (C) 2008 INdT - Instituto Nokia de Tecnologia
6 * Copyright (C) 2009-2010 ProFUSION embedded systems 6 * Copyright (C) 2009-2010 ProFUSION embedded systems
7 * Copyright (C) 2009-2011 Samsung Electronics 7 * Copyright (C) 2009-2011 Samsung Electronics
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 1142 matching lines...) Expand 10 before | Expand all | Expand 10 after
1153 1153
1154 bool RenderThemeEfl::paintMediaFullscreenButton(RenderObject* object, const Pain tInfo& info, const IntRect& rect) 1154 bool RenderThemeEfl::paintMediaFullscreenButton(RenderObject* object, const Pain tInfo& info, const IntRect& rect)
1155 { 1155 {
1156 notImplemented(); 1156 notImplemented();
1157 return false; 1157 return false;
1158 } 1158 }
1159 1159
1160 bool RenderThemeEfl::paintMediaMuteButton(RenderObject* object, const PaintInfo& info, const IntRect& rect) 1160 bool RenderThemeEfl::paintMediaMuteButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
1161 { 1161 {
1162 Node* mediaNode = object->node() ? object->node()->shadowAncestorNode() : 0; 1162 Node* mediaNode = object->node() ? object->node()->shadowAncestorNode() : 0;
1163 if (!mediaNode || (!mediaNode->hasTagName(videoTag) && !mediaNode->hasTagNam e(audioTag))) 1163 if (!mediaNode || !mediaNode->isElementNode() || !static_cast<Element*>(medi aNode)->isMediaElement())
1164 return false; 1164 return false;
1165 1165
1166 HTMLMediaElement* mediaElement = static_cast<HTMLMediaElement*>(mediaNode); 1166 HTMLMediaElement* mediaElement = static_cast<HTMLMediaElement*>(mediaNode);
1167 1167
1168 if (!emitMediaButtonSignal(MuteUnMuteButton, mediaElement->muted() ? MediaMu teButton : MediaUnMuteButton, rect)) 1168 if (!emitMediaButtonSignal(MuteUnMuteButton, mediaElement->muted() ? MediaMu teButton : MediaUnMuteButton, rect))
1169 return false; 1169 return false;
1170 1170
1171 return paintThemePart(object, MuteUnMuteButton, info, rect); 1171 return paintThemePart(object, MuteUnMuteButton, info, rect);
1172 } 1172 }
1173 1173
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
1288 return false; 1288 return false;
1289 } 1289 }
1290 1290
1291 bool RenderThemeEfl::paintMediaCurrentTime(RenderObject* object, const PaintInfo & info, const IntRect& rect) 1291 bool RenderThemeEfl::paintMediaCurrentTime(RenderObject* object, const PaintInfo & info, const IntRect& rect)
1292 { 1292 {
1293 info.context->fillRect(FloatRect(rect), m_mediaPanelColor, ColorSpaceDeviceR GB); 1293 info.context->fillRect(FloatRect(rect), m_mediaPanelColor, ColorSpaceDeviceR GB);
1294 return true; 1294 return true;
1295 } 1295 }
1296 #endif 1296 #endif
1297 } 1297 }
OLDNEW
« no previous file with comments | « Source/WebCore/page/FrameView.cpp ('k') | Source/WebCore/platform/gtk/RenderThemeGtk.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698