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

Side by Side Diff: sky/engine/core/frame/LocalFrame.cpp

Issue 758843004: Delete most of rendering/compositing. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Simon Hausmann <hausmann@kde.org> 5 * 2000 Simon Hausmann <hausmann@kde.org>
6 * 2000 Stefan Schimanski <1Stein@gmx.de> 6 * 2000 Stefan Schimanski <1Stein@gmx.de>
7 * 2001 George Staikos <staikos@kde.org> 7 * 2001 George Staikos <staikos@kde.org>
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 #include "sky/engine/core/inspector/ConsoleMessageStorage.h" 49 #include "sky/engine/core/inspector/ConsoleMessageStorage.h"
50 #include "sky/engine/core/loader/FrameLoaderClient.h" 50 #include "sky/engine/core/loader/FrameLoaderClient.h"
51 #include "sky/engine/core/loader/MojoLoader.h" 51 #include "sky/engine/core/loader/MojoLoader.h"
52 #include "sky/engine/core/page/Chrome.h" 52 #include "sky/engine/core/page/Chrome.h"
53 #include "sky/engine/core/page/EventHandler.h" 53 #include "sky/engine/core/page/EventHandler.h"
54 #include "sky/engine/core/page/FocusController.h" 54 #include "sky/engine/core/page/FocusController.h"
55 #include "sky/engine/core/page/Page.h" 55 #include "sky/engine/core/page/Page.h"
56 #include "sky/engine/core/rendering/HitTestResult.h" 56 #include "sky/engine/core/rendering/HitTestResult.h"
57 #include "sky/engine/core/rendering/RenderLayer.h" 57 #include "sky/engine/core/rendering/RenderLayer.h"
58 #include "sky/engine/core/rendering/RenderView.h" 58 #include "sky/engine/core/rendering/RenderView.h"
59 #include "sky/engine/core/rendering/compositing/RenderLayerCompositor.h"
60 #include "sky/engine/platform/graphics/GraphicsContext.h" 59 #include "sky/engine/platform/graphics/GraphicsContext.h"
61 #include "sky/engine/platform/graphics/ImageBuffer.h" 60 #include "sky/engine/platform/graphics/ImageBuffer.h"
62 #include "sky/engine/platform/text/TextStream.h" 61 #include "sky/engine/platform/text/TextStream.h"
63 #include "sky/engine/wtf/PassOwnPtr.h" 62 #include "sky/engine/wtf/PassOwnPtr.h"
64 #include "sky/engine/wtf/StdLibExtras.h" 63 #include "sky/engine/wtf/StdLibExtras.h"
65 64
66 namespace blink { 65 namespace blink {
67 66
68 inline LocalFrame::LocalFrame(FrameLoaderClient* client, FrameHost* host) 67 inline LocalFrame::LocalFrame(FrameLoaderClient* client, FrameHost* host)
69 : Frame(client, host) 68 : Frame(client, host)
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 needsLayoutObjects = 0; 316 needsLayoutObjects = 0;
318 totalObjects = 0; 317 totalObjects = 0;
319 318
320 for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) { 319 for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) {
321 ++totalObjects; 320 ++totalObjects;
322 if (o->needsLayout()) 321 if (o->needsLayout())
323 ++needsLayoutObjects; 322 ++needsLayoutObjects;
324 } 323 }
325 } 324 }
326 325
327 String LocalFrame::layerTreeAsText(LayerTreeFlags flags) const
328 {
329 TextStream textStream;
330 textStream << localLayerTreeAsText(flags);
331 return textStream.release();
332 }
333
334 String LocalFrame::localLayerTreeAsText(unsigned flags) const
335 {
336 if (!contentRenderer())
337 return String();
338
339 return contentRenderer()->compositor()->layerTreeAsText(static_cast<LayerTre eFlags>(flags));
340 }
341
342 void LocalFrame::deviceOrPageScaleFactorChanged() 326 void LocalFrame::deviceOrPageScaleFactorChanged()
343 { 327 {
344 document()->mediaQueryAffectingValueChanged(); 328 document()->mediaQueryAffectingValueChanged();
345 } 329 }
346 330
347 void LocalFrame::removeSpellingMarkersUnderWords(const Vector<String>& words) 331 void LocalFrame::removeSpellingMarkersUnderWords(const Vector<String>& words)
348 { 332 {
349 spellChecker().removeSpellingMarkersUnderWords(words); 333 spellChecker().removeSpellingMarkersUnderWords(words);
350 } 334 }
351 335
(...skipping 15 matching lines...) Expand all
367 }; 351 };
368 352
369 double LocalFrame::devicePixelRatio() const 353 double LocalFrame::devicePixelRatio() const
370 { 354 {
371 if (!m_host) 355 if (!m_host)
372 return 0; 356 return 0;
373 return m_host->deviceScaleFactor(); 357 return m_host->deviceScaleFactor();
374 } 358 }
375 359
376 } // namespace blink 360 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698