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

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

Issue 898783003: Move rendering/RenderLayer* to layout/ (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/web/WebViewImpl.h ('k') | Source/web/tests/PinchViewportTest.cpp » ('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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 #include "core/frame/Settings.h" 57 #include "core/frame/Settings.h"
58 #include "core/frame/SmartClip.h" 58 #include "core/frame/SmartClip.h"
59 #include "core/html/HTMLInputElement.h" 59 #include "core/html/HTMLInputElement.h"
60 #include "core/html/HTMLMediaElement.h" 60 #include "core/html/HTMLMediaElement.h"
61 #include "core/html/HTMLPlugInElement.h" 61 #include "core/html/HTMLPlugInElement.h"
62 #include "core/html/HTMLTextAreaElement.h" 62 #include "core/html/HTMLTextAreaElement.h"
63 #include "core/html/canvas/WebGLRenderingContext.h" 63 #include "core/html/canvas/WebGLRenderingContext.h"
64 #include "core/html/forms/PopupMenuClient.h" 64 #include "core/html/forms/PopupMenuClient.h"
65 #include "core/html/ime/InputMethodContext.h" 65 #include "core/html/ime/InputMethodContext.h"
66 #include "core/inspector/InspectorController.h" 66 #include "core/inspector/InspectorController.h"
67 #include "core/layout/compositing/RenderLayerCompositor.h" 67 #include "core/layout/compositing/LayerCompositor.h"
68 #include "core/loader/DocumentLoader.h" 68 #include "core/loader/DocumentLoader.h"
69 #include "core/loader/FrameLoader.h" 69 #include "core/loader/FrameLoader.h"
70 #include "core/loader/UniqueIdentifier.h" 70 #include "core/loader/UniqueIdentifier.h"
71 #include "core/page/Chrome.h" 71 #include "core/page/Chrome.h"
72 #include "core/page/ContextMenuController.h" 72 #include "core/page/ContextMenuController.h"
73 #include "core/page/ContextMenuProvider.h" 73 #include "core/page/ContextMenuProvider.h"
74 #include "core/page/DragController.h" 74 #include "core/page/DragController.h"
75 #include "core/page/DragData.h" 75 #include "core/page/DragData.h"
76 #include "core/page/DragSession.h" 76 #include "core/page/DragSession.h"
77 #include "core/page/EventHandler.h" 77 #include "core/page/EventHandler.h"
(...skipping 4192 matching lines...) Expand 10 before | Expand all | Expand 10 after
4270 updateLayerTreeViewport(); 4270 updateLayerTreeViewport();
4271 } else if (m_client) 4271 } else if (m_client)
4272 m_client->didInvalidateRect(rect); 4272 m_client->didInvalidateRect(rect);
4273 } 4273 }
4274 4274
4275 GraphicsLayerFactory* WebViewImpl::graphicsLayerFactory() const 4275 GraphicsLayerFactory* WebViewImpl::graphicsLayerFactory() const
4276 { 4276 {
4277 return m_graphicsLayerFactory.get(); 4277 return m_graphicsLayerFactory.get();
4278 } 4278 }
4279 4279
4280 RenderLayerCompositor* WebViewImpl::compositor() const 4280 LayerCompositor* WebViewImpl::compositor() const
4281 { 4281 {
4282 if (!page() || !page()->mainFrame()) 4282 if (!page() || !page()->mainFrame())
4283 return 0; 4283 return 0;
4284 4284
4285 if (!page()->mainFrame()->isLocalFrame()) 4285 if (!page()->mainFrame()->isLocalFrame())
4286 return localFrameRootTemporary()->frame()->document()->renderView()->com positor(); 4286 return localFrameRootTemporary()->frame()->document()->renderView()->com positor();
4287 4287
4288 if (!page()->deprecatedLocalMainFrame()->document() || !page()->deprecatedLo calMainFrame()->document()->renderView()) 4288 if (!page()->deprecatedLocalMainFrame()->document() || !page()->deprecatedLo calMainFrame()->document()->renderView())
4289 return 0; 4289 return 0;
4290 4290
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
4620 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width 4620 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
4621 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); 4621 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1);
4622 } 4622 }
4623 4623
4624 void WebViewImpl::forceNextWebGLContextCreationToFail() 4624 void WebViewImpl::forceNextWebGLContextCreationToFail()
4625 { 4625 {
4626 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); 4626 WebGLRenderingContext::forceNextWebGLContextCreationToFail();
4627 } 4627 }
4628 4628
4629 } // namespace blink 4629 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/WebViewImpl.h ('k') | Source/web/tests/PinchViewportTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698