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

Side by Side Diff: Source/core/frame/PinchViewport.cpp

Issue 1115553002: Removing blink::prefix (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 7 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
« no previous file with comments | « Source/core/frame/PinchViewport.h ('k') | Source/core/frame/UseCounter.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 345
346 // FIXME: The root transform layer should only be created on demand. 346 // FIXME: The root transform layer should only be created on demand.
347 m_rootTransformLayer = GraphicsLayer::create(graphicsLayerFactory, this) ; 347 m_rootTransformLayer = GraphicsLayer::create(graphicsLayerFactory, this) ;
348 m_innerViewportContainerLayer = GraphicsLayer::create(graphicsLayerFacto ry, this); 348 m_innerViewportContainerLayer = GraphicsLayer::create(graphicsLayerFacto ry, this);
349 m_overscrollElasticityLayer = GraphicsLayer::create(graphicsLayerFactory , this); 349 m_overscrollElasticityLayer = GraphicsLayer::create(graphicsLayerFactory , this);
350 m_pageScaleLayer = GraphicsLayer::create(graphicsLayerFactory, this); 350 m_pageScaleLayer = GraphicsLayer::create(graphicsLayerFactory, this);
351 m_innerViewportScrollLayer = GraphicsLayer::create(graphicsLayerFactory, this); 351 m_innerViewportScrollLayer = GraphicsLayer::create(graphicsLayerFactory, this);
352 m_overlayScrollbarHorizontal = GraphicsLayer::create(graphicsLayerFactor y, this); 352 m_overlayScrollbarHorizontal = GraphicsLayer::create(graphicsLayerFactor y, this);
353 m_overlayScrollbarVertical = GraphicsLayer::create(graphicsLayerFactory, this); 353 m_overlayScrollbarVertical = GraphicsLayer::create(graphicsLayerFactory, this);
354 354
355 blink::ScrollingCoordinator* coordinator = frameHost().page().scrollingC oordinator(); 355 ScrollingCoordinator* coordinator = frameHost().page().scrollingCoordina tor();
356 ASSERT(coordinator); 356 ASSERT(coordinator);
357 coordinator->setLayerIsContainerForFixedPositionLayers(m_innerViewportSc rollLayer.get(), true); 357 coordinator->setLayerIsContainerForFixedPositionLayers(m_innerViewportSc rollLayer.get(), true);
358 358
359 // Set masks to bounds so the compositor doesn't clobber a manually 359 // Set masks to bounds so the compositor doesn't clobber a manually
360 // set inner viewport container layer size. 360 // set inner viewport container layer size.
361 m_innerViewportContainerLayer->setMasksToBounds(frameHost().settings().m ainFrameClipsContent()); 361 m_innerViewportContainerLayer->setMasksToBounds(frameHost().settings().m ainFrameClipsContent());
362 m_innerViewportContainerLayer->setSize(m_size); 362 m_innerViewportContainerLayer->setSize(m_size);
363 363
364 m_innerViewportScrollLayer->platformLayer()->setScrollClipLayer( 364 m_innerViewportScrollLayer->platformLayer()->setScrollClipLayer(
365 m_innerViewportContainerLayer->platformLayer()); 365 m_innerViewportContainerLayer->platformLayer());
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after
724 } else if (graphicsLayer == m_rootTransformLayer) { 724 } else if (graphicsLayer == m_rootTransformLayer) {
725 name = "Root Transform Layer"; 725 name = "Root Transform Layer";
726 } else { 726 } else {
727 ASSERT_NOT_REACHED(); 727 ASSERT_NOT_REACHED();
728 } 728 }
729 729
730 return name; 730 return name;
731 } 731 }
732 732
733 } // namespace blink 733 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/PinchViewport.h ('k') | Source/core/frame/UseCounter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698