| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Apple Inc. | 2 * Copyright (C) 2009 Apple Inc. |
| 3 * Copyright (C) 2009 Google Inc. | 3 * Copyright (C) 2009 Google Inc. |
| 4 * All rights reserved. | 4 * 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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 } | 77 } |
| 78 | 78 |
| 79 static Image* platformResource(const char* currentName, const char* newName) | 79 static Image* platformResource(const char* currentName, const char* newName) |
| 80 { | 80 { |
| 81 // Return currentName or newName based on current or new playback. | 81 // Return currentName or newName based on current or new playback. |
| 82 return platformResource(RuntimeEnabledFeatures::newMediaPlaybackUiEnabled()
? newName : currentName); | 82 return platformResource(RuntimeEnabledFeatures::newMediaPlaybackUiEnabled()
? newName : currentName); |
| 83 } | 83 } |
| 84 | 84 |
| 85 static bool hasSource(const HTMLMediaElement* mediaElement) | 85 static bool hasSource(const HTMLMediaElement* mediaElement) |
| 86 { | 86 { |
| 87 return mediaElement->getNetworkState() != HTMLMediaElement::NETWORK_EMPTY | 87 return mediaElement->getNetworkState() != HTMLMediaElement::kNetworkEmpty |
| 88 && mediaElement->getNetworkState() != HTMLMediaElement::NETWORK_NO_SOURC
E; | 88 && mediaElement->getNetworkState() != HTMLMediaElement::kNetworkNoSource
; |
| 89 } | 89 } |
| 90 | 90 |
| 91 static FloatRect adjustRectForPadding(IntRect rect, const LayoutObject* object) | 91 static FloatRect adjustRectForPadding(IntRect rect, const LayoutObject* object) |
| 92 { | 92 { |
| 93 FloatRect adjustedRect(rect); | 93 FloatRect adjustedRect(rect); |
| 94 | 94 |
| 95 if (!object) | 95 if (!object) |
| 96 return adjustedRect; | 96 return adjustedRect; |
| 97 | 97 |
| 98 // TODO(liberato): make this more elegant, crbug.com/598861 . | 98 // TODO(liberato): make this more elegant, crbug.com/598861 . |
| (...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 632 } | 632 } |
| 633 | 633 |
| 634 float zoomLevel = style.effectiveZoom(); | 634 float zoomLevel = style.effectiveZoom(); |
| 635 if (thumbImage) { | 635 if (thumbImage) { |
| 636 style.setWidth(Length(static_cast<int>(width * zoomLevel), Fixed)); | 636 style.setWidth(Length(static_cast<int>(width * zoomLevel), Fixed)); |
| 637 style.setHeight(Length(static_cast<int>(height * zoomLevel), Fixed)); | 637 style.setHeight(Length(static_cast<int>(height * zoomLevel), Fixed)); |
| 638 } | 638 } |
| 639 } | 639 } |
| 640 | 640 |
| 641 } // namespace blink | 641 } // namespace blink |
| OLD | NEW |