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

Unified Diff: Source/core/layout/LayoutTextTrackContainerElement.cpp

Issue 988763002: Start separating the text track container from the media controls (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase. Created 5 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/layout/LayoutTextTrackContainerElement.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutTextTrackContainerElement.cpp
diff --git a/Source/core/layout/LayoutTextTrackContainerElement.cpp b/Source/core/layout/LayoutTextTrackContainerElement.cpp
deleted file mode 100644
index 27ef571dd57a3f0cdb2a59e9bd742bec91abc613..0000000000000000000000000000000000000000
--- a/Source/core/layout/LayoutTextTrackContainerElement.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
- * Copyright (C) 2012 Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#include "core/layout/LayoutTextTrackContainerElement.h"
-
-#include "core/frame/DeprecatedScheduleStyleRecalcDuringLayout.h"
-#include "core/layout/LayoutView.h"
-
-namespace blink {
-
-LayoutTextTrackContainerElement::LayoutTextTrackContainerElement(Element* element)
- : LayoutBlockFlow(element)
-{
-}
-
-void LayoutTextTrackContainerElement::layout()
-{
- LayoutBlockFlow::layout();
- if (style()->display() == NONE)
- return;
-
- ASSERT(mediaControlElementType(node()) == MediaTextTrackDisplayContainer);
-
- DeprecatedScheduleStyleRecalcDuringLayout marker(node()->document().lifecycle());
-
- static_cast<MediaControlTextTrackContainerElement*>(node())->updateSizes();
-}
-
-} // namespace blink
« no previous file with comments | « Source/core/layout/LayoutTextTrackContainerElement.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698