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

Side by Side Diff: Source/core/rendering/RenderView.cpp

Issue 22454003: Support subtitles for native fullscreen video (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: add dangling pointer check Created 7 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 1162 matching lines...) Expand 10 before | Expand all | Expand 10 after
1173 return std::min(viewLogicalWidth(ScrollableArea::IncludeScrollbars), viewLog icalHeight(ScrollableArea::IncludeScrollbars)) 1173 return std::min(viewLogicalWidth(ScrollableArea::IncludeScrollbars), viewLog icalHeight(ScrollableArea::IncludeScrollbars))
1174 * percentage / 100.f; 1174 * percentage / 100.f;
1175 } 1175 }
1176 1176
1177 LayoutUnit RenderView::viewportPercentageMax(float percentage) const 1177 LayoutUnit RenderView::viewportPercentageMax(float percentage) const
1178 { 1178 {
1179 return std::max(viewLogicalWidth(ScrollableArea::IncludeScrollbars), viewLog icalHeight(ScrollableArea::IncludeScrollbars)) 1179 return std::max(viewLogicalWidth(ScrollableArea::IncludeScrollbars), viewLog icalHeight(ScrollableArea::IncludeScrollbars))
1180 * percentage / 100.f; 1180 * percentage / 100.f;
1181 } 1181 }
1182 1182
1183 void RenderView::setCurrentFullscreenRenderer(RenderObject* renderer)
1184 {
1185 compositor()->setCurrentFullscreenRenderer(renderer);
1186 }
1187
1183 FragmentationDisabler::FragmentationDisabler(RenderObject* root) 1188 FragmentationDisabler::FragmentationDisabler(RenderObject* root)
1184 { 1189 {
1185 RenderView* renderView = root->view(); 1190 RenderView* renderView = root->view();
1186 ASSERT(renderView); 1191 ASSERT(renderView);
1187 1192
1188 LayoutState* layoutState = renderView->layoutState(); 1193 LayoutState* layoutState = renderView->layoutState();
1189 1194
1190 m_root = root; 1195 m_root = root;
1191 m_fragmenting = layoutState && layoutState->isPaginated(); 1196 m_fragmenting = layoutState && layoutState->isPaginated();
1192 m_flowThreadState = m_root->flowThreadState(); 1197 m_flowThreadState = m_root->flowThreadState();
(...skipping 19 matching lines...) Expand all
1212 #endif 1217 #endif
1213 1218
1214 if (layoutState) 1219 if (layoutState)
1215 layoutState->m_isPaginated = m_fragmenting; 1220 layoutState->m_isPaginated = m_fragmenting;
1216 1221
1217 if (m_flowThreadState != RenderObject::NotInsideFlowThread) 1222 if (m_flowThreadState != RenderObject::NotInsideFlowThread)
1218 m_root->setFlowThreadStateIncludingDescendants(m_flowThreadState); 1223 m_root->setFlowThreadStateIncludingDescendants(m_flowThreadState);
1219 } 1224 }
1220 1225
1221 } // namespace WebCore 1226 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698