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

Side by Side Diff: Source/WebKit/chromium/src/WebViewImpl.cpp

Issue 11235025: Merge 129511 - [chromium] adding a page overlay causes endless update loop when accelerated composi… (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1271/
Patch Set: Created 8 years, 2 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 | « no previous file | 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) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 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 1789 matching lines...) Expand 10 before | Expand all | Expand 10 after
1800 void WebViewImpl::composite(bool) 1800 void WebViewImpl::composite(bool)
1801 { 1801 {
1802 #if USE(ACCELERATED_COMPOSITING) 1802 #if USE(ACCELERATED_COMPOSITING)
1803 if (Platform::current()->compositorSupport()->isThreadingEnabled()) 1803 if (Platform::current()->compositorSupport()->isThreadingEnabled())
1804 m_layerTreeView->setNeedsRedraw(); 1804 m_layerTreeView->setNeedsRedraw();
1805 else { 1805 else {
1806 ASSERT(isAcceleratedCompositingActive()); 1806 ASSERT(isAcceleratedCompositingActive());
1807 if (!page()) 1807 if (!page())
1808 return; 1808 return;
1809 1809
1810 if (m_pageOverlays)
1811 m_pageOverlays->update();
1812
1813 m_layerTreeView->composite(); 1810 m_layerTreeView->composite();
1814 } 1811 }
1815 #endif 1812 #endif
1816 } 1813 }
1817 1814
1818 void WebViewImpl::setNeedsRedraw() 1815 void WebViewImpl::setNeedsRedraw()
1819 { 1816 {
1820 #if USE(ACCELERATED_COMPOSITING) 1817 #if USE(ACCELERATED_COMPOSITING)
1821 if (m_layerTreeView && isAcceleratedCompositingActive()) 1818 if (m_layerTreeView && isAcceleratedCompositingActive())
1822 m_layerTreeView->setNeedsRedraw(); 1819 m_layerTreeView->setNeedsRedraw();
(...skipping 2280 matching lines...) Expand 10 before | Expand all | Expand 10 after
4103 const WebMouseEvent& mouseEvent = static_cast<const WebMouseEvent&>(event); 4100 const WebMouseEvent& mouseEvent = static_cast<const WebMouseEvent&>(event);
4104 4101
4105 if (page()) 4102 if (page())
4106 page()->pointerLockController()->dispatchLockedMouseEvent( 4103 page()->pointerLockController()->dispatchLockedMouseEvent(
4107 PlatformMouseEventBuilder(mainFrameImpl()->frameView(), mouseEvent), 4104 PlatformMouseEventBuilder(mainFrameImpl()->frameView(), mouseEvent),
4108 eventType); 4105 eventType);
4109 } 4106 }
4110 #endif 4107 #endif
4111 4108
4112 } // namespace WebKit 4109 } // namespace WebKit
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698