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

Side by Side Diff: third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp

Issue 2657863004: Move scroll paint property nodes to be owned by the transform tree (Closed)
Patch Set: Rebase & remove parens 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
« no previous file with comments | « third_party/WebKit/Source/platform/testing/TestPaintArtifact.cpp ('k') | no next file » | 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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 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 758 matching lines...) Expand 10 before | Expand all | Expand 10 after
769 runPendingTasks(); 769 runPendingTasks();
770 770
771 WebPluginContainerImpl* container = static_cast<WebPluginContainerImpl*>( 771 WebPluginContainerImpl* container = static_cast<WebPluginContainerImpl*>(
772 getWebPluginContainer(webView, WebString::fromUTF8("plugin"))); 772 getWebPluginContainer(webView, WebString::fromUTF8("plugin")));
773 ASSERT_TRUE(container); 773 ASSERT_TRUE(container);
774 Element* element = static_cast<Element*>(container->element()); 774 Element* element = static_cast<Element*>(container->element());
775 const auto* plugin = 775 const auto* plugin =
776 static_cast<const CompositedPlugin*>(container->plugin()); 776 static_cast<const CompositedPlugin*>(container->plugin());
777 777
778 std::unique_ptr<PaintController> paintController = PaintController::create(); 778 std::unique_ptr<PaintController> paintController = PaintController::create();
779 PropertyTreeState propertyTreeState( 779 PropertyTreeState propertyTreeState(TransformPaintPropertyNode::root(),
780 TransformPaintPropertyNode::root(), ClipPaintPropertyNode::root(), 780 ClipPaintPropertyNode::root(),
781 EffectPaintPropertyNode::root(), ScrollPaintPropertyNode::root()); 781 EffectPaintPropertyNode::root());
782 PaintChunkProperties properties(propertyTreeState); 782 PaintChunkProperties properties(propertyTreeState);
783 783
784 paintController->updateCurrentPaintChunkProperties(nullptr, properties); 784 paintController->updateCurrentPaintChunkProperties(nullptr, properties);
785 GraphicsContext graphicsContext(*paintController); 785 GraphicsContext graphicsContext(*paintController);
786 container->paint(graphicsContext, CullRect(IntRect(10, 10, 400, 300))); 786 container->paint(graphicsContext, CullRect(IntRect(10, 10, 400, 300)));
787 paintController->commitNewDisplayItems(); 787 paintController->commitNewDisplayItems();
788 788
789 const auto& displayItems = 789 const auto& displayItems =
790 paintController->paintArtifact().getDisplayItemList(); 790 paintController->paintArtifact().getDisplayItemList();
791 ASSERT_EQ(1u, displayItems.size()); 791 ASSERT_EQ(1u, displayItems.size());
(...skipping 23 matching lines...) Expand all
815 WebString::fromUTF8("translated-plugin")); 815 WebString::fromUTF8("translated-plugin"));
816 pluginContainerOneElement.pluginContainer()->setWantsWheelEvents(true); 816 pluginContainerOneElement.pluginContainer()->setWantsWheelEvents(true);
817 817
818 runPendingTasks(); 818 runPendingTasks();
819 EXPECT_TRUE( 819 EXPECT_TRUE(
820 webView->page()->frameHost().eventHandlerRegistry().hasEventHandlers( 820 webView->page()->frameHost().eventHandlerRegistry().hasEventHandlers(
821 EventHandlerRegistry::WheelEventBlocking)); 821 EventHandlerRegistry::WheelEventBlocking));
822 } 822 }
823 823
824 } // namespace blink 824 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/testing/TestPaintArtifact.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698