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

Side by Side Diff: sky/engine/core/editing/EditorCommand.cpp

Issue 834693007: Remove the remaining parts of ignorePendingStylesheets and placeholder styles. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Remove comment. Created 5 years, 11 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
4 * Copyright (C) 2009 Igalia S.L. 4 * Copyright (C) 2009 Igalia S.L.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after
588 ASSERT(m_frame); 588 ASSERT(m_frame);
589 } 589 }
590 590
591 bool Editor::Command::execute(const String& parameter, Event* triggeringEvent) c onst 591 bool Editor::Command::execute(const String& parameter, Event* triggeringEvent) c onst
592 { 592 {
593 if (!isEnabled(triggeringEvent)) { 593 if (!isEnabled(triggeringEvent)) {
594 // Let certain commands be executed when performed explicitly even if th ey are disabled. 594 // Let certain commands be executed when performed explicitly even if th ey are disabled.
595 if (!isSupported() || !m_frame || !m_command->allowExecutionWhenDisabled ) 595 if (!isSupported() || !m_frame || !m_command->allowExecutionWhenDisabled )
596 return false; 596 return false;
597 } 597 }
598 m_frame->document()->updateLayoutIgnorePendingStylesheets(); 598 m_frame->document()->updateLayout();
599 blink::Platform::current()->histogramSparse("WebCore.Editing.Commands", m_co mmand->idForUserMetrics); 599 blink::Platform::current()->histogramSparse("WebCore.Editing.Commands", m_co mmand->idForUserMetrics);
600 return m_command->execute(*m_frame, triggeringEvent, m_source, parameter); 600 return m_command->execute(*m_frame, triggeringEvent, m_source, parameter);
601 } 601 }
602 602
603 bool Editor::Command::execute(Event* triggeringEvent) const 603 bool Editor::Command::execute(Event* triggeringEvent) const
604 { 604 {
605 return execute(String(), triggeringEvent); 605 return execute(String(), triggeringEvent);
606 } 606 }
607 607
608 bool Editor::Command::isSupported() const 608 bool Editor::Command::isSupported() const
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
647 { 647 {
648 return m_command && m_command->isTextInsertion; 648 return m_command && m_command->isTextInsertion;
649 } 649 }
650 650
651 int Editor::Command::idForHistogram() const 651 int Editor::Command::idForHistogram() const
652 { 652 {
653 return isSupported() ? m_command->idForUserMetrics : 0; 653 return isSupported() ? m_command->idForUserMetrics : 0;
654 } 654 }
655 655
656 } // namespace blink 656 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/editing/DeleteSelectionCommand.cpp ('k') | sky/engine/core/editing/FrameSelection.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698