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

Unified Diff: Source/core/html/HTMLLinkElement.cpp

Issue 1140153006: Remove Navigation Transitions from Blink. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Removed layout tests. Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/html/HTMLLinkElement.h ('k') | Source/core/html/LinkRelAttribute.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/HTMLLinkElement.cpp
diff --git a/Source/core/html/HTMLLinkElement.cpp b/Source/core/html/HTMLLinkElement.cpp
index 04d681c7141a5011d0136e6c759e030016b6694d..a1f97128ea5e919d88c93d68ce91c952e66607f7 100644
--- a/Source/core/html/HTMLLinkElement.cpp
+++ b/Source/core/html/HTMLLinkElement.cpp
@@ -222,7 +222,7 @@ LinkResource* HTMLLinkElement::linkResourceToProcess()
m_link = LinkDefaultPresentation::create(this);
} else {
OwnPtrWillBeRawPtr<LinkStyle> link = LinkStyle::create(this);
- if (fastHasAttribute(disabledAttr) || m_relAttribute.isTransitionExitingStylesheet())
+ if (fastHasAttribute(disabledAttr))
link->setDisabledState(true);
m_link = link.release();
}
@@ -258,14 +258,6 @@ void HTMLLinkElement::process()
link->process();
}
-void HTMLLinkElement::setEnabledIfExitTransitionStyle(bool enabled)
-{
- if (m_relAttribute.isTransitionExitingStylesheet()) {
- if (LinkStyle* link = linkStyle())
- link->setDisabledState(!enabled);
- }
-}
-
Node::InsertionNotificationRequest HTMLLinkElement::insertedInto(ContainerNode* insertionPoint)
{
if (insertionPoint->inDocument()) {
@@ -710,8 +702,7 @@ void LinkStyle::process()
if (!m_owner->loadLink(type, as, builder.url()))
return;
- if ((m_disabledState != Disabled) && (m_owner->relAttribute().isStyleSheet() || m_owner->relAttribute().isTransitionExitingStylesheet())
- && shouldLoadResource() && builder.url().isValid()) {
+ if (m_disabledState != Disabled && m_owner->relAttribute().isStyleSheet() && shouldLoadResource() && builder.url().isValid()) {
if (resource()) {
removePendingSheet();
« no previous file with comments | « Source/core/html/HTMLLinkElement.h ('k') | Source/core/html/LinkRelAttribute.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698