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

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

Issue 16599003: :hover style not applied on hover if its display property is different from original style's (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Patch (fixed test that was expected to fail and is now passing) Created 7 years, 6 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/HTMLFrameSetElement.h ('k') | Source/core/html/HTMLImageElement.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, 2009, 2010 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2006, 2009, 2010 Apple Inc. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 } 157 }
158 158
159 RenderObject *HTMLFrameSetElement::createRenderer(RenderArena *arena, RenderStyl e *style) 159 RenderObject *HTMLFrameSetElement::createRenderer(RenderArena *arena, RenderStyl e *style)
160 { 160 {
161 if (style->hasContent()) 161 if (style->hasContent())
162 return RenderObject::createObject(this, style); 162 return RenderObject::createObject(this, style);
163 163
164 return new (arena) RenderFrameSet(this); 164 return new (arena) RenderFrameSet(this);
165 } 165 }
166 166
167 void HTMLFrameSetElement::attach() 167 void HTMLFrameSetElement::attach(const AttachContext& context)
168 { 168 {
169 // Inherit default settings from parent frameset 169 // Inherit default settings from parent frameset
170 // FIXME: This is not dynamic. 170 // FIXME: This is not dynamic.
171 for (ContainerNode* node = parentNode(); node; node = node->parentNode()) { 171 for (ContainerNode* node = parentNode(); node; node = node->parentNode()) {
172 if (node->hasTagName(framesetTag)) { 172 if (node->hasTagName(framesetTag)) {
173 HTMLFrameSetElement* frameset = static_cast<HTMLFrameSetElement*>(no de); 173 HTMLFrameSetElement* frameset = static_cast<HTMLFrameSetElement*>(no de);
174 if (!m_frameborderSet) 174 if (!m_frameborderSet)
175 m_frameborder = frameset->hasFrameBorder(); 175 m_frameborder = frameset->hasFrameBorder();
176 if (m_frameborder) { 176 if (m_frameborder) {
177 if (!m_borderSet) 177 if (!m_borderSet)
178 m_border = frameset->border(); 178 m_border = frameset->border();
179 if (!m_borderColorSet) 179 if (!m_borderColorSet)
180 m_borderColorSet = frameset->hasBorderColor(); 180 m_borderColorSet = frameset->hasBorderColor();
181 } 181 }
182 if (!m_noresize) 182 if (!m_noresize)
183 m_noresize = frameset->noResize(); 183 m_noresize = frameset->noResize();
184 break; 184 break;
185 } 185 }
186 } 186 }
187 187
188 HTMLElement::attach(); 188 HTMLElement::attach(context);
189 } 189 }
190 190
191 void HTMLFrameSetElement::defaultEventHandler(Event* evt) 191 void HTMLFrameSetElement::defaultEventHandler(Event* evt)
192 { 192 {
193 if (evt->isMouseEvent() && !m_noresize && renderer() && renderer()->isFrameS et()) { 193 if (evt->isMouseEvent() && !m_noresize && renderer() && renderer()->isFrameS et()) {
194 if (toRenderFrameSet(renderer())->userResize(static_cast<MouseEvent*>(ev t))) { 194 if (toRenderFrameSet(renderer())->userResize(static_cast<MouseEvent*>(ev t))) {
195 evt->setDefaultHandled(); 195 evt->setDefaultHandled();
196 return; 196 return;
197 } 197 }
198 } 198 }
(...skipping 22 matching lines...) Expand all
221 Node* frameNode = children()->namedItem(name); 221 Node* frameNode = children()->namedItem(name);
222 if (!frameNode || !frameNode->hasTagName(HTMLNames::frameTag)) 222 if (!frameNode || !frameNode->hasTagName(HTMLNames::frameTag))
223 return 0; 223 return 0;
224 Document* document = static_cast<HTMLFrameElement*>(frameNode)->contentDocum ent(); 224 Document* document = static_cast<HTMLFrameElement*>(frameNode)->contentDocum ent();
225 if (!document || !document->frame()) 225 if (!document || !document->frame())
226 return 0; 226 return 0;
227 return document->domWindow(); 227 return document->domWindow();
228 } 228 }
229 229
230 } // namespace WebCore 230 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/html/HTMLFrameSetElement.h ('k') | Source/core/html/HTMLImageElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698