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

Side by Side Diff: Source/WebCore/rendering/RenderObject.h

Issue 14067007: Remove 3D_RENDERING define from Blink (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased, retrying the bots Created 7 years, 8 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) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
6 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 1290 matching lines...) Expand 10 before | Expand all | Expand 10 after
1301 { 1301 {
1302 if (m_bitfields.boxDecorationState() == HasBoxDecorationsAndBackgroundObscur ationStatusInvalid) { 1302 if (m_bitfields.boxDecorationState() == HasBoxDecorationsAndBackgroundObscur ationStatusInvalid) {
1303 BoxDecorationState boxDecorationState = computeBackgroundIsKnownToBeObsc ured() ? HasBoxDecorationsAndBackgroundIsKnownToBeObscured : HasBoxDecorationsAn dBackgroundMayBeVisible; 1303 BoxDecorationState boxDecorationState = computeBackgroundIsKnownToBeObsc ured() ? HasBoxDecorationsAndBackgroundIsKnownToBeObscured : HasBoxDecorationsAn dBackgroundMayBeVisible;
1304 m_bitfields.setBoxDecorationState(boxDecorationState); 1304 m_bitfields.setBoxDecorationState(boxDecorationState);
1305 } 1305 }
1306 return m_bitfields.boxDecorationState() == HasBoxDecorationsAndBackgroundIsK nownToBeObscured; 1306 return m_bitfields.boxDecorationState() == HasBoxDecorationsAndBackgroundIsK nownToBeObscured;
1307 } 1307 }
1308 1308
1309 inline void makeMatrixRenderable(TransformationMatrix& matrix, bool has3DRenderi ng) 1309 inline void makeMatrixRenderable(TransformationMatrix& matrix, bool has3DRenderi ng)
1310 { 1310 {
1311 #if !ENABLE(3D_RENDERING)
1312 UNUSED_PARAM(has3DRendering);
1313 matrix.makeAffine();
1314 #else
1315 if (!has3DRendering) 1311 if (!has3DRendering)
1316 matrix.makeAffine(); 1312 matrix.makeAffine();
1317 #endif
1318 } 1313 }
1319 1314
1320 inline int adjustForAbsoluteZoom(int value, RenderObject* renderer) 1315 inline int adjustForAbsoluteZoom(int value, RenderObject* renderer)
1321 { 1316 {
1322 return adjustForAbsoluteZoom(value, renderer->style()); 1317 return adjustForAbsoluteZoom(value, renderer->style());
1323 } 1318 }
1324 1319
1325 inline LayoutUnit adjustLayoutUnitForAbsoluteZoom(LayoutUnit value, RenderObject * renderer) 1320 inline LayoutUnit adjustLayoutUnitForAbsoluteZoom(LayoutUnit value, RenderObject * renderer)
1326 { 1321 {
1327 return adjustLayoutUnitForAbsoluteZoom(value, renderer->style()); 1322 return adjustLayoutUnitForAbsoluteZoom(value, renderer->style());
(...skipping 19 matching lines...) Expand all
1347 // Outside the WebCore namespace for ease of invocation from gdb. 1342 // Outside the WebCore namespace for ease of invocation from gdb.
1348 void showTree(const WebCore::RenderObject*); 1343 void showTree(const WebCore::RenderObject*);
1349 void showLineTree(const WebCore::RenderObject*); 1344 void showLineTree(const WebCore::RenderObject*);
1350 void showRenderTree(const WebCore::RenderObject* object1); 1345 void showRenderTree(const WebCore::RenderObject* object1);
1351 // We don't make object2 an optional parameter so that showRenderTree 1346 // We don't make object2 an optional parameter so that showRenderTree
1352 // can be called from gdb easily. 1347 // can be called from gdb easily.
1353 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2); 1348 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2);
1354 #endif 1349 #endif
1355 1350
1356 #endif // RenderObject_h 1351 #endif // RenderObject_h
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderLayerCompositor.cpp ('k') | Source/WebCore/rendering/RenderObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698