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

Side by Side Diff: third_party/WebKit/Source/core/frame/VisualViewport.cpp

Issue 2701993002: DO NOT COMMIT: Results of running new (proposed) clang-format on Blink (Closed)
Patch Set: Created 3 years, 10 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 scrollbarGraphicsLayer->setDrawsContent(false); 464 scrollbarGraphicsLayer->setDrawsContent(false);
465 } 465 }
466 466
467 int xPosition = isHorizontal ? 0 467 int xPosition = isHorizontal ? 0
468 : m_innerViewportContainerLayer->size().width() - 468 : m_innerViewportContainerLayer->size().width() -
469 scrollbarThickness; 469 scrollbarThickness;
470 int yPosition = 470 int yPosition =
471 isHorizontal 471 isHorizontal
472 ? m_innerViewportContainerLayer->size().height() - scrollbarThickness 472 ? m_innerViewportContainerLayer->size().height() - scrollbarThickness
473 : 0; 473 : 0;
474 int width = 474 int width = isHorizontal ? m_innerViewportContainerLayer->size().width() -
475 isHorizontal 475 scrollbarThickness
476 ? m_innerViewportContainerLayer->size().width() - scrollbarThickness 476 : scrollbarThickness;
477 : scrollbarThickness;
478 int height = isHorizontal ? scrollbarThickness 477 int height = isHorizontal ? scrollbarThickness
479 : m_innerViewportContainerLayer->size().height() - 478 : m_innerViewportContainerLayer->size().height() -
480 scrollbarThickness; 479 scrollbarThickness;
481 480
482 // Use the GraphicsLayer to position the scrollbars. 481 // Use the GraphicsLayer to position the scrollbars.
483 scrollbarGraphicsLayer->setPosition(IntPoint(xPosition, yPosition)); 482 scrollbarGraphicsLayer->setPosition(IntPoint(xPosition, yPosition));
484 scrollbarGraphicsLayer->setSize(FloatSize(width, height)); 483 scrollbarGraphicsLayer->setSize(FloatSize(width, height));
485 scrollbarGraphicsLayer->setContentsRect(IntRect(0, 0, width, height)); 484 scrollbarGraphicsLayer->setContentsRect(IntRect(0, 0, width, height));
486 } 485 }
487 486
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
855 } else if (graphicsLayer == m_rootTransformLayer.get()) { 854 } else if (graphicsLayer == m_rootTransformLayer.get()) {
856 name = "Root Transform Layer"; 855 name = "Root Transform Layer";
857 } else { 856 } else {
858 ASSERT_NOT_REACHED(); 857 ASSERT_NOT_REACHED();
859 } 858 }
860 859
861 return name; 860 return name;
862 } 861 }
863 862
864 } // namespace blink 863 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698