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

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

Issue 138523003: Removed unnecessary parameter from didActivateCompositor() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Removing unnecessary argument in another file: Source/web/WebPagePopupImpl.cpp Created 6 years, 9 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/web/WebPopupMenuImpl.cpp ('k') | public/web/WebWidgetClient.h » ('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) 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 3720 matching lines...) Expand 10 before | Expand all | Expand 10 after
3731 // we don't attempt to paint too early in the next page load. 3731 // we don't attempt to paint too early in the next page load.
3732 m_layerTreeView->setDeferCommits(true); 3732 m_layerTreeView->setDeferCommits(true);
3733 m_layerTreeViewCommitsDeferred = true; 3733 m_layerTreeViewCommitsDeferred = true;
3734 } 3734 }
3735 } else if (m_layerTreeView) { 3735 } else if (m_layerTreeView) {
3736 m_isAcceleratedCompositingActive = true; 3736 m_isAcceleratedCompositingActive = true;
3737 updateLayerTreeViewport(); 3737 updateLayerTreeViewport();
3738 if (m_pageOverlays) 3738 if (m_pageOverlays)
3739 m_pageOverlays->update(); 3739 m_pageOverlays->update();
3740 3740
3741 m_client->didActivateCompositor(0); 3741 m_client->didActivateCompositor();
3742 } else { 3742 } else {
3743 TRACE_EVENT0("webkit", "WebViewImpl::setIsAcceleratedCompositingActive(t rue)"); 3743 TRACE_EVENT0("webkit", "WebViewImpl::setIsAcceleratedCompositingActive(t rue)");
3744 3744
3745 m_client->initializeLayerTreeView(); 3745 m_client->initializeLayerTreeView();
3746 m_layerTreeView = m_client->layerTreeView(); 3746 m_layerTreeView = m_client->layerTreeView();
3747 if (m_layerTreeView) { 3747 if (m_layerTreeView) {
3748 m_layerTreeView->setRootLayer(*m_rootLayer); 3748 m_layerTreeView->setRootLayer(*m_rootLayer);
3749 3749
3750 bool visible = page()->visibilityState() == PageVisibilityStateVisib le; 3750 bool visible = page()->visibilityState() == PageVisibilityStateVisib le;
3751 m_layerTreeView->setVisible(visible); 3751 m_layerTreeView->setVisible(visible);
3752 updateLayerTreeDeviceScaleFactor(); 3752 updateLayerTreeDeviceScaleFactor();
3753 m_layerTreeView->setPageScaleFactorAndLimits(pageScaleFactor(), mini mumPageScaleFactor(), maximumPageScaleFactor()); 3753 m_layerTreeView->setPageScaleFactorAndLimits(pageScaleFactor(), mini mumPageScaleFactor(), maximumPageScaleFactor());
3754 updateLayerTreeBackgroundColor(); 3754 updateLayerTreeBackgroundColor();
3755 m_layerTreeView->setHasTransparentBackground(isTransparent()); 3755 m_layerTreeView->setHasTransparentBackground(isTransparent());
3756 #if USE(RUBBER_BANDING) 3756 #if USE(RUBBER_BANDING)
3757 RefPtr<Image> overhangImage = OverscrollTheme::theme()->getOverhangI mage(); 3757 RefPtr<Image> overhangImage = OverscrollTheme::theme()->getOverhangI mage();
3758 if (overhangImage) 3758 if (overhangImage)
3759 m_layerTreeView->setOverhangBitmap(overhangImage->nativeImageFor CurrentFrame()->bitmap()); 3759 m_layerTreeView->setOverhangBitmap(overhangImage->nativeImageFor CurrentFrame()->bitmap());
3760 #endif 3760 #endif
3761 updateLayerTreeViewport(); 3761 updateLayerTreeViewport();
3762 m_client->didActivateCompositor(0); 3762 m_client->didActivateCompositor();
3763 m_isAcceleratedCompositingActive = true; 3763 m_isAcceleratedCompositingActive = true;
3764 m_compositorCreationFailed = false; 3764 m_compositorCreationFailed = false;
3765 if (m_pageOverlays) 3765 if (m_pageOverlays)
3766 m_pageOverlays->update(); 3766 m_pageOverlays->update();
3767 m_layerTreeView->setShowFPSCounter(m_showFPSCounter); 3767 m_layerTreeView->setShowFPSCounter(m_showFPSCounter);
3768 m_layerTreeView->setShowPaintRects(m_showPaintRects); 3768 m_layerTreeView->setShowPaintRects(m_showPaintRects);
3769 m_layerTreeView->setShowDebugBorders(m_showDebugBorders); 3769 m_layerTreeView->setShowDebugBorders(m_showDebugBorders);
3770 m_layerTreeView->setContinuousPaintingEnabled(m_continuousPaintingEn abled); 3770 m_layerTreeView->setContinuousPaintingEnabled(m_continuousPaintingEn abled);
3771 m_layerTreeView->setShowScrollBottleneckRects(m_showScrollBottleneck Rects); 3771 m_layerTreeView->setShowScrollBottleneckRects(m_showScrollBottleneck Rects);
3772 } else { 3772 } else {
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
3968 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); 3968 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints();
3969 3969
3970 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) 3970 if (!mainFrameImpl() || !mainFrameImpl()->frameView())
3971 return false; 3971 return false;
3972 3972
3973 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width 3973 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
3974 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); 3974 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1);
3975 } 3975 }
3976 3976
3977 } // namespace blink 3977 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/WebPopupMenuImpl.cpp ('k') | public/web/WebWidgetClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698