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

Side by Side Diff: third_party/WebKit/Source/web/WebViewImpl.cpp

Issue 2297503002: Fix usage of DocumentLifecycle::DisallowTransitionScope (Closed)
Patch Set: Add missing layout update Created 4 years, 3 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 | « third_party/WebKit/Source/web/WebLocalFrameImpl.cpp ('k') | no next file » | 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) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 2424 matching lines...) Expand 10 before | Expand all | Expand 10 after
2435 if (info.type == WebTextInputTypeNone) 2435 if (info.type == WebTextInputTypeNone)
2436 return info; 2436 return info;
2437 2437
2438 if (!focused->editor().canEdit()) 2438 if (!focused->editor().canEdit())
2439 return info; 2439 return info;
2440 2440
2441 // TODO(dglazkov): The use of updateStyleAndLayoutIgnorePendingStylesheets n eeds to be audited. 2441 // TODO(dglazkov): The use of updateStyleAndLayoutIgnorePendingStylesheets n eeds to be audited.
2442 // see http://crbug.com/590369 for more details. 2442 // see http://crbug.com/590369 for more details.
2443 focused->document()->updateStyleAndLayoutIgnorePendingStylesheets(); 2443 focused->document()->updateStyleAndLayoutIgnorePendingStylesheets();
2444 2444
2445 DocumentLifecycle::DisallowTransitionScope(focused->document()->lifecycle()) ; 2445 DocumentLifecycle::DisallowTransitionScope disallowTransition(focused->docum ent()->lifecycle());
2446 2446
2447 // Emits an object replacement character for each replaced element so that 2447 // Emits an object replacement character for each replaced element so that
2448 // it is exposed to IME and thus could be deleted by IME on android. 2448 // it is exposed to IME and thus could be deleted by IME on android.
2449 info.value = plainText(EphemeralRange::rangeOfContents(*element), TextIterat orEmitsObjectReplacementCharacter); 2449 info.value = plainText(EphemeralRange::rangeOfContents(*element), TextIterat orEmitsObjectReplacementCharacter);
2450 2450
2451 if (info.value.isEmpty()) 2451 if (info.value.isEmpty())
2452 return info; 2452 return info;
2453 2453
2454 EphemeralRange firstRange = firstEphemeralRangeOf(selection.selection()); 2454 EphemeralRange firstRange = firstEphemeralRangeOf(selection.selection());
2455 if (firstRange.isNotNull()) { 2455 if (firstRange.isNotNull()) {
(...skipping 2152 matching lines...) Expand 10 before | Expand all | Expand 10 after
4608 return nullptr; 4608 return nullptr;
4609 return focusedFrame; 4609 return focusedFrame;
4610 } 4610 }
4611 4611
4612 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const 4612 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const
4613 { 4613 {
4614 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr; 4614 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
4615 } 4615 }
4616 4616
4617 } // namespace blink 4617 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebLocalFrameImpl.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698