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

Side by Side Diff: Source/core/testing/Internals.cpp

Issue 1360203002: Fix media element time display for times over an hour. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 3 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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * Copyright (C) 2013 Apple Inc. All rights reserved. 3 * Copyright (C) 2013 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 #include "core/html/shadow/TextControlInnerElements.h" 94 #include "core/html/shadow/TextControlInnerElements.h"
95 #include "core/input/EventHandler.h" 95 #include "core/input/EventHandler.h"
96 #include "core/inspector/ConsoleMessageStorage.h" 96 #include "core/inspector/ConsoleMessageStorage.h"
97 #include "core/inspector/InspectorConsoleAgent.h" 97 #include "core/inspector/InspectorConsoleAgent.h"
98 #include "core/inspector/InspectorFrontendChannel.h" 98 #include "core/inspector/InspectorFrontendChannel.h"
99 #include "core/inspector/InspectorInstrumentation.h" 99 #include "core/inspector/InspectorInstrumentation.h"
100 #include "core/inspector/InstanceCounters.h" 100 #include "core/inspector/InstanceCounters.h"
101 #include "core/inspector/InstrumentingAgents.h" 101 #include "core/inspector/InstrumentingAgents.h"
102 #include "core/layout/LayoutMenuList.h" 102 #include "core/layout/LayoutMenuList.h"
103 #include "core/layout/LayoutObject.h" 103 #include "core/layout/LayoutObject.h"
104 #include "core/layout/LayoutTheme.h"
104 #include "core/layout/LayoutTreeAsText.h" 105 #include "core/layout/LayoutTreeAsText.h"
105 #include "core/layout/LayoutView.h" 106 #include "core/layout/LayoutView.h"
106 #include "core/layout/compositing/CompositedDeprecatedPaintLayerMapping.h" 107 #include "core/layout/compositing/CompositedDeprecatedPaintLayerMapping.h"
107 #include "core/layout/compositing/DeprecatedPaintLayerCompositor.h" 108 #include "core/layout/compositing/DeprecatedPaintLayerCompositor.h"
108 #include "core/loader/FrameLoader.h" 109 #include "core/loader/FrameLoader.h"
109 #include "core/loader/HistoryItem.h" 110 #include "core/loader/HistoryItem.h"
110 #include "core/page/ChromeClient.h" 111 #include "core/page/ChromeClient.h"
111 #include "core/page/FocusController.h" 112 #include "core/page/FocusController.h"
112 #include "core/page/NetworkStateNotifier.h" 113 #include "core/page/NetworkStateNotifier.h"
113 #include "core/page/Page.h" 114 #include "core/page/Page.h"
(...skipping 2407 matching lines...) Expand 10 before | Expand all | Expand 10 after
2521 return false; 2522 return false;
2522 2523
2523 return animator->setScrollbarsVisibleForTesting(visible); 2524 return animator->setScrollbarsVisibleForTesting(visible);
2524 } 2525 }
2525 2526
2526 void Internals::forceRestrictIFramePermissions() 2527 void Internals::forceRestrictIFramePermissions()
2527 { 2528 {
2528 RuntimeEnabledFeatures::setRestrictIFramePermissionsEnabled(true); 2529 RuntimeEnabledFeatures::setRestrictIFramePermissionsEnabled(true);
2529 } 2530 }
2530 2531
2532 String Internals::formatChromiumMediaControlsTime(float time, float duration, bo ol includeSeparator)
2533 {
2534 return LayoutTheme::formatChromiumMediaControlsTime(time, duration, includeS eparator);
2535 }
2536
2531 } // namespace blink 2537 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698