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

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

Issue 1374793005: Single image reload fix (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 2 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 | « Source/core/html/HTMLObjectElement.cpp ('k') | Source/core/html/HTMLVideoElement.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) 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 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 if (m_persistedPluginWidget) { 167 if (m_persistedPluginWidget) {
168 HTMLFrameOwnerElement::UpdateSuspendScope suspendWidgetHierarchyUpda tes; 168 HTMLFrameOwnerElement::UpdateSuspendScope suspendWidgetHierarchyUpda tes;
169 setPersistedPluginWidget(nullptr); 169 setPersistedPluginWidget(nullptr);
170 } 170 }
171 return; 171 return;
172 } 172 }
173 173
174 if (isImageType()) { 174 if (isImageType()) {
175 if (!m_imageLoader) 175 if (!m_imageLoader)
176 m_imageLoader = HTMLImageLoader::create(this); 176 m_imageLoader = HTMLImageLoader::create(this);
177 m_imageLoader->updateFromElement(); 177 m_imageLoader->updateFromElement(0);
178 } else if (needsWidgetUpdate() 178 } else if (needsWidgetUpdate()
179 && layoutEmbeddedObject() 179 && layoutEmbeddedObject()
180 && !layoutEmbeddedObject()->showsUnavailablePluginIndicator() 180 && !layoutEmbeddedObject()->showsUnavailablePluginIndicator()
181 && !wouldLoadAsNetscapePlugin(m_url, m_serviceType) 181 && !wouldLoadAsNetscapePlugin(m_url, m_serviceType)
182 && !m_isDelayingLoadEvent) { 182 && !m_isDelayingLoadEvent) {
183 m_isDelayingLoadEvent = true; 183 m_isDelayingLoadEvent = true;
184 document().incrementLoadEventDelayCount(); 184 document().incrementLoadEventDelayCount();
185 document().loadPluginsSoon(); 185 document().loadPluginsSoon();
186 } 186 }
187 } 187 }
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
635 return openShadowRoot(); 635 return openShadowRoot();
636 } 636 }
637 637
638 void HTMLPlugInElement::lazyReattachIfNeeded() 638 void HTMLPlugInElement::lazyReattachIfNeeded()
639 { 639 {
640 if (!useFallbackContent() && needsWidgetUpdate() && layoutObject() && !isIma geType()) 640 if (!useFallbackContent() && needsWidgetUpdate() && layoutObject() && !isIma geType())
641 lazyReattachIfAttached(); 641 lazyReattachIfAttached();
642 } 642 }
643 643
644 } 644 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLObjectElement.cpp ('k') | Source/core/html/HTMLVideoElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698