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

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

Issue 60113005: Enable chromium_code=1 on Windows (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: . Created 7 years, 1 month 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) 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 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 #endif 358 #endif
359 m_layoutState = 0; 359 m_layoutState = 0;
360 clearNeedsLayout(); 360 clearNeedsLayout();
361 361
362 if (isSeamlessAncestorInFlowThread) 362 if (isSeamlessAncestorInFlowThread)
363 flowThreadController()->setCurrentRenderFlowThread(0); 363 flowThreadController()->setCurrentRenderFlowThread(0);
364 } 364 }
365 365
366 void RenderView::mapLocalToContainer(const RenderLayerModelObject* repaintContai ner, TransformState& transformState, MapCoordinatesFlags mode, bool* wasFixed) c onst 366 void RenderView::mapLocalToContainer(const RenderLayerModelObject* repaintContai ner, TransformState& transformState, MapCoordinatesFlags mode, bool* wasFixed) c onst
367 { 367 {
368 ASSERT_UNUSED(wasFixed, !wasFixed || *wasFixed == (mode & IsFixed)); 368 ASSERT_UNUSED(wasFixed, !wasFixed || *wasFixed == static_cast<bool>(mode & I sFixed));
369 369
370 if (!repaintContainer && mode & UseTransforms && shouldUseTransformFromConta iner(0)) { 370 if (!repaintContainer && mode & UseTransforms && shouldUseTransformFromConta iner(0)) {
371 TransformationMatrix t; 371 TransformationMatrix t;
372 getTransformFromContainer(0, LayoutSize(), t); 372 getTransformFromContainer(0, LayoutSize(), t);
373 transformState.applyTransform(t); 373 transformState.applyTransform(t);
374 } 374 }
375 375
376 if (mode & IsFixed && m_frameView) 376 if (mode & IsFixed && m_frameView)
377 transformState.move(m_frameView->scrollOffsetForFixedPosition()); 377 transformState.move(m_frameView->scrollOffsetForFixedPosition());
378 378
(...skipping 892 matching lines...) Expand 10 before | Expand all | Expand 10 after
1271 #endif 1271 #endif
1272 1272
1273 if (layoutState) 1273 if (layoutState)
1274 layoutState->m_isPaginated = m_fragmenting; 1274 layoutState->m_isPaginated = m_fragmenting;
1275 1275
1276 if (m_flowThreadState != RenderObject::NotInsideFlowThread) 1276 if (m_flowThreadState != RenderObject::NotInsideFlowThread)
1277 m_root->setFlowThreadStateIncludingDescendants(m_flowThreadState); 1277 m_root->setFlowThreadStateIncludingDescendants(m_flowThreadState);
1278 } 1278 }
1279 1279
1280 } // namespace WebCore 1280 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698