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

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

Issue 1223843003: Remove support for loading remote font faces (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 5 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 | « sky/engine/core/events/EventTargetFactory.in ('k') | 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) 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 Dirk Mueller <mueller@kde.org> 5 * 2000 Dirk Mueller <mueller@kde.org>
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * Copyright (C) 2009 Google Inc. All rights reserved. 9 * Copyright (C) 2009 Google Inc. All rights reserved.
10 * 10 *
(...skipping 10 matching lines...) Expand all
21 * You should have received a copy of the GNU Library General Public License 21 * You should have received a copy of the GNU Library General Public License
22 * along with this library; see the file COPYING.LIB. If not, write to 22 * along with this library; see the file COPYING.LIB. If not, write to
23 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 23 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
24 * Boston, MA 02110-1301, USA. 24 * Boston, MA 02110-1301, USA.
25 */ 25 */
26 26
27 #include "sky/engine/core/frame/FrameView.h" 27 #include "sky/engine/core/frame/FrameView.h"
28 28
29 #include "gen/sky/platform/RuntimeEnabledFeatures.h" 29 #include "gen/sky/platform/RuntimeEnabledFeatures.h"
30 #include "sky/engine/core/animation/DocumentAnimations.h" 30 #include "sky/engine/core/animation/DocumentAnimations.h"
31 #include "sky/engine/core/css/FontFaceSet.h"
32 #include "sky/engine/core/css/resolver/StyleResolver.h" 31 #include "sky/engine/core/css/resolver/StyleResolver.h"
33 #include "sky/engine/core/dom/DocumentMarkerController.h" 32 #include "sky/engine/core/dom/DocumentMarkerController.h"
34 #include "sky/engine/core/editing/FrameSelection.h" 33 #include "sky/engine/core/editing/FrameSelection.h"
35 #include "sky/engine/core/fetch/ResourceFetcher.h" 34 #include "sky/engine/core/fetch/ResourceFetcher.h"
36 #include "sky/engine/core/frame/FrameHost.h" 35 #include "sky/engine/core/frame/FrameHost.h"
37 #include "sky/engine/core/frame/LocalFrame.h" 36 #include "sky/engine/core/frame/LocalFrame.h"
38 #include "sky/engine/core/frame/Settings.h" 37 #include "sky/engine/core/frame/Settings.h"
39 #include "sky/engine/core/loader/FrameLoaderClient.h" 38 #include "sky/engine/core/loader/FrameLoaderClient.h"
40 #include "sky/engine/core/page/ChromeClient.h" 39 #include "sky/engine/core/page/ChromeClient.h"
41 #include "sky/engine/core/page/EventHandler.h" 40 #include "sky/engine/core/page/EventHandler.h"
(...skipping 493 matching lines...) Expand 10 before | Expand all | Expand 10 after
535 534
536 m_frame->selection().setCaretRectNeedsUpdate(); 535 m_frame->selection().setCaretRectNeedsUpdate();
537 m_frame->selection().updateAppearance(); 536 m_frame->selection().updateAppearance();
538 537
539 ASSERT(m_frame->document()); 538 ASSERT(m_frame->document());
540 if (m_nestedLayoutCount <= 1) { 539 if (m_nestedLayoutCount <= 1) {
541 if (m_firstLayoutCallbackPending) 540 if (m_firstLayoutCallbackPending)
542 m_firstLayoutCallbackPending = false; 541 m_firstLayoutCallbackPending = false;
543 } 542 }
544 543
545 FontFaceSet::didLayout(*m_frame->document());
546
547 sendResizeEventIfNeeded(); 544 sendResizeEventIfNeeded();
548 } 545 }
549 546
550 bool FrameView::wasViewportResized() 547 bool FrameView::wasViewportResized()
551 { 548 {
552 return layoutSize() != m_lastViewportSize; 549 return layoutSize() != m_lastViewportSize;
553 } 550 }
554 551
555 void FrameView::sendResizeEventIfNeeded() 552 void FrameView::sendResizeEventIfNeeded()
556 { 553 {
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
764 totalObjects = 0; 761 totalObjects = 0;
765 762
766 for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) { 763 for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) {
767 ++totalObjects; 764 ++totalObjects;
768 if (o->needsLayout()) 765 if (o->needsLayout())
769 ++needsLayoutObjects; 766 ++needsLayoutObjects;
770 } 767 }
771 } 768 }
772 769
773 } // namespace blink 770 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/events/EventTargetFactory.in ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698