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

Unified Diff: Source/web/WebViewImpl.cpp

Issue 61773005: Rename WebKit namespace to blink (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/web/WebViewImpl.h ('k') | Source/web/WebWorkerClientImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebViewImpl.cpp
diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp
index fc833a1fc1a3e1a4172a685a51b86716d6abd6d3..d417d26a3a4df91158c61a389fe291de8e6f1935 100644
--- a/Source/web/WebViewImpl.cpp
+++ b/Source/web/WebViewImpl.cpp
@@ -200,7 +200,7 @@ static const float minScaleChangeToTriggerZoom = 1.05f;
static const float leftBoxRatio = 0.3f;
static const int caretPadding = 10;
-namespace WebKit {
+namespace blink {
// Change the text zoom level by kTextSizeMultiplierRatio each time the user
// zooms text in or out (ie., change by 20%). The min and max values limit
@@ -1887,8 +1887,8 @@ void WebViewImpl::paint(WebCanvas* canvas, const WebRect& rect, PaintOptions opt
PageWidgetDelegate::paint(m_page.get(), pageOverlays(), canvas, rect, isTransparent() ? PageWidgetDelegate::Translucent : PageWidgetDelegate::Opaque);
double paintEnd = currentTime();
double pixelsPerSec = (rect.width * rect.height) / (paintEnd - paintStart);
- WebKit::Platform::current()->histogramCustomCounts("Renderer4.SoftwarePaintDurationMS", (paintEnd - paintStart) * 1000, 0, 120, 30);
- WebKit::Platform::current()->histogramCustomCounts("Renderer4.SoftwarePaintMegapixPerSecond", pixelsPerSec / 1000000, 10, 210, 30);
+ blink::Platform::current()->histogramCustomCounts("Renderer4.SoftwarePaintDurationMS", (paintEnd - paintStart) * 1000, 0, 120, 30);
+ blink::Platform::current()->histogramCustomCounts("Renderer4.SoftwarePaintMegapixPerSecond", pixelsPerSec / 1000000, 10, 210, 30);
if (isAcceleratedCompositingActive()) {
ASSERT(option == ForceSoftwareRenderingAndIgnoreGPUResidentContent);
@@ -3938,7 +3938,7 @@ void WebViewImpl::scheduleAnimation()
void WebViewImpl::setIsAcceleratedCompositingActive(bool active)
{
- WebKit::Platform::current()->histogramEnumeration("GPU.setIsAcceleratedCompositingActive", active * 2 + m_isAcceleratedCompositingActive, 4);
+ blink::Platform::current()->histogramEnumeration("GPU.setIsAcceleratedCompositingActive", active * 2 + m_isAcceleratedCompositingActive, 4);
if (m_isAcceleratedCompositingActive == active)
return;
@@ -3952,7 +3952,7 @@ void WebViewImpl::setIsAcceleratedCompositingActive(bool active)
m_layerTreeView->finishAllRendering();
m_client->didDeactivateCompositor();
if (!m_layerTreeViewCommitsDeferred
- && WebKit::Platform::current()->isThreadedCompositingEnabled()) {
+ && blink::Platform::current()->isThreadedCompositingEnabled()) {
ASSERT(m_layerTreeView);
// In threaded compositing mode, force compositing mode is always on so setIsAcceleratedCompositingActive(false)
// means that we're transitioning to a new page. Suppress commits until WebKit generates invalidations so
@@ -4203,4 +4203,4 @@ bool WebViewImpl::shouldDisableDesktopWorkarounds()
|| (constraints.minimumScale == constraints.maximumScale && constraints.minimumScale != -1);
}
-} // namespace WebKit
+} // namespace blink
« no previous file with comments | « Source/web/WebViewImpl.h ('k') | Source/web/WebWorkerClientImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698