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

Side by Side Diff: Source/WebCore/platform/gtk/RenderThemeGtk.cpp

Issue 8758009: Merge 100408 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/912/
Patch Set: '' Created 9 years 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) 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) 2009 Kenneth Rohde Christiansen 5 * Copyright (C) 2009 Kenneth Rohde Christiansen
6 * Copyright (C) 2010 Igalia S.L. 6 * Copyright (C) 2010 Igalia S.L.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after
518 return false; 518 return false;
519 519
520 return paintMediaButton(renderObject, paintInfo.context, rect, mediaElement- >muted() ? "audio-volume-muted" : "audio-volume-high"); 520 return paintMediaButton(renderObject, paintInfo.context, rect, mediaElement- >muted() ? "audio-volume-muted" : "audio-volume-high");
521 } 521 }
522 522
523 bool RenderThemeGtk::paintMediaPlayButton(RenderObject* renderObject, const Pain tInfo& paintInfo, const IntRect& rect) 523 bool RenderThemeGtk::paintMediaPlayButton(RenderObject* renderObject, const Pain tInfo& paintInfo, const IntRect& rect)
524 { 524 {
525 Node* node = renderObject->node(); 525 Node* node = renderObject->node();
526 if (!node) 526 if (!node)
527 return false; 527 return false;
528 if (!node->isMediaControlElement())
529 return false;
528 530
529 MediaControlPlayButtonElement* button = static_cast<MediaControlPlayButtonEl ement*>(node); 531 return paintMediaButton(renderObject, paintInfo.context, rect, mediaControlE lementType(node) == MediaPlayButton ? GTK_STOCK_MEDIA_PLAY : GTK_STOCK_MEDIA_PAU SE);
530 return paintMediaButton(renderObject, paintInfo.context, rect, button->displ ayType() == MediaPlayButton ? GTK_STOCK_MEDIA_PLAY : GTK_STOCK_MEDIA_PAUSE);
531 } 532 }
532 533
533 bool RenderThemeGtk::paintMediaSeekBackButton(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect) 534 bool RenderThemeGtk::paintMediaSeekBackButton(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
534 { 535 {
535 return paintMediaButton(renderObject, paintInfo.context, rect, GTK_STOCK_MED IA_REWIND); 536 return paintMediaButton(renderObject, paintInfo.context, rect, GTK_STOCK_MED IA_REWIND);
536 } 537 }
537 538
538 bool RenderThemeGtk::paintMediaSeekForwardButton(RenderObject* renderObject, con st PaintInfo& paintInfo, const IntRect& rect) 539 bool RenderThemeGtk::paintMediaSeekForwardButton(RenderObject* renderObject, con st PaintInfo& paintInfo, const IntRect& rect)
539 { 540 {
540 return paintMediaButton(renderObject, paintInfo.context, rect, GTK_STOCK_MED IA_FORWARD); 541 return paintMediaButton(renderObject, paintInfo.context, rect, GTK_STOCK_MED IA_FORWARD);
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
711 CString systemFilename = fileSystemRepresentation(filenames[0]); 712 CString systemFilename = fileSystemRepresentation(filenames[0]);
712 gchar* systemBasename = g_path_get_basename(systemFilename.data()); 713 gchar* systemBasename = g_path_get_basename(systemFilename.data());
713 stringByAdoptingFileSystemRepresentation(systemBasename, string); 714 stringByAdoptingFileSystemRepresentation(systemBasename, string);
714 } else if (filenames.size() > 1) 715 } else if (filenames.size() > 1)
715 return StringTruncator::rightTruncate(multipleFileUploadText(filenames.s ize()), width, font, StringTruncator::EnableRoundingHacks); 716 return StringTruncator::rightTruncate(multipleFileUploadText(filenames.s ize()), width, font, StringTruncator::EnableRoundingHacks);
716 717
717 return StringTruncator::centerTruncate(string, width, font, StringTruncator: :EnableRoundingHacks); 718 return StringTruncator::centerTruncate(string, width, font, StringTruncator: :EnableRoundingHacks);
718 } 719 }
719 720
720 } 721 }
OLDNEW
« no previous file with comments | « Source/WebCore/platform/efl/RenderThemeEfl.cpp ('k') | Source/WebCore/rendering/RenderThemeMac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698