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

Side by Side Diff: Source/core/html/HTMLPlugInElement.cpp

Issue 145663012: Remove the layout timer (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: updateLayout Created 6 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/core/frame/FrameView.cpp ('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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de) 4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de)
5 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. 5 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 if (!m_imageLoader) 122 if (!m_imageLoader)
123 m_imageLoader = adoptPtr(new HTMLImageLoader(this)); 123 m_imageLoader = adoptPtr(new HTMLImageLoader(this));
124 m_imageLoader->updateFromElement(); 124 m_imageLoader->updateFromElement();
125 } else if (needsWidgetUpdate() 125 } else if (needsWidgetUpdate()
126 && renderEmbeddedObject() 126 && renderEmbeddedObject()
127 && !renderEmbeddedObject()->showsUnavailablePluginIndicator() 127 && !renderEmbeddedObject()->showsUnavailablePluginIndicator()
128 && !wouldLoadAsNetscapePlugin(m_url, m_serviceType) 128 && !wouldLoadAsNetscapePlugin(m_url, m_serviceType)
129 && !m_isDelayingLoadEvent) { 129 && !m_isDelayingLoadEvent) {
130 m_isDelayingLoadEvent = true; 130 m_isDelayingLoadEvent = true;
131 document().incrementLoadEventDelayCount(); 131 document().incrementLoadEventDelayCount();
132 document().loadPluginsSoon();
132 } 133 }
133 } 134 }
134 135
135 void HTMLPlugInElement::updateWidget() 136 void HTMLPlugInElement::updateWidget()
136 { 137 {
137 RefPtr<HTMLPlugInElement> protector(this); 138 RefPtr<HTMLPlugInElement> protector(this);
138 updateWidgetInternal(); 139 updateWidgetInternal();
139 if (m_isDelayingLoadEvent) { 140 if (m_isDelayingLoadEvent) {
140 m_isDelayingLoadEvent = false; 141 m_isDelayingLoadEvent = false;
141 document().decrementLoadEventDelayCount(); 142 document().decrementLoadEventDelayCount();
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 if (root.isOldestAuthorShadowRoot()) 526 if (root.isOldestAuthorShadowRoot())
526 lazyReattachIfAttached(); 527 lazyReattachIfAttached();
527 } 528 }
528 529
529 bool HTMLPlugInElement::useFallbackContent() const 530 bool HTMLPlugInElement::useFallbackContent() const
530 { 531 {
531 return hasAuthorShadowRoot(); 532 return hasAuthorShadowRoot();
532 } 533 }
533 534
534 } 535 }
OLDNEW
« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698