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

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

Issue 14632007: Add loadedNonEmptyDocument flag in iframe for Resource Timing (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Satisfy lighttpd on windows, and handle overlap timestamps Created 7 years, 7 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/HTMLIFrameElement.h ('k') | Source/core/loader/FrameLoaderStateMachine.h » ('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 Simon Hausmann (hausmann@kde.org) 4 * (C) 2000 Simon Hausmann (hausmann@kde.org)
5 * (C) 2001 Dirk Mueller (mueller@kde.org) 5 * (C) 2001 Dirk Mueller (mueller@kde.org)
6 * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved.
7 * Copyright (C) 2009 Ericsson AB. All rights reserved. 7 * Copyright (C) 2009 Ericsson AB. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 23 matching lines...) Expand all
34 #include "core/page/Frame.h" 34 #include "core/page/Frame.h"
35 #include "core/rendering/RenderIFrame.h" 35 #include "core/rendering/RenderIFrame.h"
36 #include <wtf/text/TextPosition.h> 36 #include <wtf/text/TextPosition.h>
37 37
38 namespace WebCore { 38 namespace WebCore {
39 39
40 using namespace HTMLNames; 40 using namespace HTMLNames;
41 41
42 inline HTMLIFrameElement::HTMLIFrameElement(const QualifiedName& tagName, Docume nt* document) 42 inline HTMLIFrameElement::HTMLIFrameElement(const QualifiedName& tagName, Docume nt* document)
43 : HTMLFrameElementBase(tagName, document) 43 : HTMLFrameElementBase(tagName, document)
44 , m_didLoadNonEmptyDocument(false)
44 { 45 {
45 ASSERT(hasTagName(iframeTag)); 46 ASSERT(hasTagName(iframeTag));
46 ScriptWrappable::init(this); 47 ScriptWrappable::init(this);
47 setHasCustomStyleCallbacks(); 48 setHasCustomStyleCallbacks();
48 } 49 }
49 50
50 PassRefPtr<HTMLIFrameElement> HTMLIFrameElement::create(const QualifiedName& tag Name, Document* document) 51 PassRefPtr<HTMLIFrameElement> HTMLIFrameElement::create(const QualifiedName& tag Name, Document* document)
51 { 52 {
52 return adoptRef(new HTMLIFrameElement(tagName, document)); 53 return adoptRef(new HTMLIFrameElement(tagName, document));
53 } 54 }
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 void HTMLIFrameElement::didRecalcStyle(StyleChange styleChange) 134 void HTMLIFrameElement::didRecalcStyle(StyleChange styleChange)
134 { 135 {
135 if (!shouldDisplaySeamlessly()) 136 if (!shouldDisplaySeamlessly())
136 return; 137 return;
137 Document* childDocument = contentDocument(); 138 Document* childDocument = contentDocument();
138 if (styleChange >= Inherit || childDocument->childNeedsStyleRecalc() || chil dDocument->needsStyleRecalc()) 139 if (styleChange >= Inherit || childDocument->childNeedsStyleRecalc() || chil dDocument->needsStyleRecalc())
139 contentDocument()->recalcStyle(styleChange); 140 contentDocument()->recalcStyle(styleChange);
140 } 141 }
141 142
142 } 143 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLIFrameElement.h ('k') | Source/core/loader/FrameLoaderStateMachine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698