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

Side by Side Diff: Source/web/WebPluginContainerImpl.cpp

Issue 46163008: Revert "Re-land deferred compositing updates with fixed assumptions" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
509 } 509 }
510 510
511 void WebPluginContainerImpl::setWantsWheelEvents(bool wantsWheelEvents) 511 void WebPluginContainerImpl::setWantsWheelEvents(bool wantsWheelEvents)
512 { 512 {
513 if (m_wantsWheelEvents == wantsWheelEvents) 513 if (m_wantsWheelEvents == wantsWheelEvents)
514 return; 514 return;
515 m_wantsWheelEvents = wantsWheelEvents; 515 m_wantsWheelEvents = wantsWheelEvents;
516 if (Page* page = m_element->document().page()) { 516 if (Page* page = m_element->document().page()) {
517 if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordina tor()) { 517 if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordina tor()) {
518 if (parent() && parent()->isFrameView()) 518 if (parent() && parent()->isFrameView())
519 scrollingCoordinator->notifyLayoutUpdated(); 519 scrollingCoordinator->frameViewLayoutUpdated(toFrameView(parent( )));
520 } 520 }
521 } 521 }
522 } 522 }
523 523
524 WebPoint WebPluginContainerImpl::windowToLocalPoint(const WebPoint& point) 524 WebPoint WebPluginContainerImpl::windowToLocalPoint(const WebPoint& point)
525 { 525 {
526 ScrollView* view = toScrollView(parent()); 526 ScrollView* view = toScrollView(parent());
527 if (!view) 527 if (!view)
528 return point; 528 return point;
529 WebPoint windowPoint = view->windowToContents(point); 529 WebPoint windowPoint = view->windowToContents(point);
(...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after
891 // Take our element and get the clip rect from the enclosing layer and 891 // Take our element and get the clip rect from the enclosing layer and
892 // frame view. 892 // frame view.
893 clipRect.intersect( 893 clipRect.intersect(
894 m_element->document().view()->windowClipRectForFrameOwner(m_element, true)); 894 m_element->document().view()->windowClipRectForFrameOwner(m_element, true));
895 } 895 }
896 896
897 return clipRect; 897 return clipRect;
898 } 898 }
899 899
900 } // namespace WebKit 900 } // namespace WebKit
OLDNEW
« no previous file with comments | « Source/web/PageWidgetDelegate.cpp ('k') | Source/web/tests/ScrollingCoordinatorChromiumTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698