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

Side by Side Diff: Source/core/frame/DOMWindow.cpp

Issue 211773002: Rename updateStyle to updateRenderTree (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix tracing test Created 6 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/editing/InputMethodController.cpp ('k') | Source/core/frame/FrameView.cpp » ('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) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 980 matching lines...) Expand 10 before | Expand all | Expand 10 after
991 if (!m_frame) 991 if (!m_frame)
992 return; 992 return;
993 m_frame->loader().stopAllLoaders(); 993 m_frame->loader().stopAllLoaders();
994 } 994 }
995 995
996 void DOMWindow::alert(const String& message) 996 void DOMWindow::alert(const String& message)
997 { 997 {
998 if (!m_frame) 998 if (!m_frame)
999 return; 999 return;
1000 1000
1001 m_frame->document()->updateStyleIfNeeded(); 1001 m_frame->document()->updateRenderTreeIfNeeded();
1002 1002
1003 FrameHost* host = m_frame->host(); 1003 FrameHost* host = m_frame->host();
1004 if (!host) 1004 if (!host)
1005 return; 1005 return;
1006 1006
1007 host->chrome().runJavaScriptAlert(m_frame, message); 1007 host->chrome().runJavaScriptAlert(m_frame, message);
1008 } 1008 }
1009 1009
1010 bool DOMWindow::confirm(const String& message) 1010 bool DOMWindow::confirm(const String& message)
1011 { 1011 {
1012 if (!m_frame) 1012 if (!m_frame)
1013 return false; 1013 return false;
1014 1014
1015 m_frame->document()->updateStyleIfNeeded(); 1015 m_frame->document()->updateRenderTreeIfNeeded();
1016 1016
1017 FrameHost* host = m_frame->host(); 1017 FrameHost* host = m_frame->host();
1018 if (!host) 1018 if (!host)
1019 return false; 1019 return false;
1020 1020
1021 return host->chrome().runJavaScriptConfirm(m_frame, message); 1021 return host->chrome().runJavaScriptConfirm(m_frame, message);
1022 } 1022 }
1023 1023
1024 String DOMWindow::prompt(const String& message, const String& defaultValue) 1024 String DOMWindow::prompt(const String& message, const String& defaultValue)
1025 { 1025 {
1026 if (!m_frame) 1026 if (!m_frame)
1027 return String(); 1027 return String();
1028 1028
1029 m_frame->document()->updateStyleIfNeeded(); 1029 m_frame->document()->updateRenderTreeIfNeeded();
1030 1030
1031 FrameHost* host = m_frame->host(); 1031 FrameHost* host = m_frame->host();
1032 if (!host) 1032 if (!host)
1033 return String(); 1033 return String();
1034 1034
1035 String returnValue; 1035 String returnValue;
1036 if (host->chrome().runJavaScriptPrompt(m_frame, message, defaultValue, retur nValue)) 1036 if (host->chrome().runJavaScriptPrompt(m_frame, message, defaultValue, retur nValue))
1037 return returnValue; 1037 return returnValue;
1038 1038
1039 return String(); 1039 return String();
(...skipping 820 matching lines...) Expand 10 before | Expand all | Expand 10 after
1860 return static_cast<DOMWindowLifecycleNotifier&>(LifecycleContext<DOMWindow>: :lifecycleNotifier()); 1860 return static_cast<DOMWindowLifecycleNotifier&>(LifecycleContext<DOMWindow>: :lifecycleNotifier());
1861 } 1861 }
1862 1862
1863 PassOwnPtr<LifecycleNotifier<DOMWindow> > DOMWindow::createLifecycleNotifier() 1863 PassOwnPtr<LifecycleNotifier<DOMWindow> > DOMWindow::createLifecycleNotifier()
1864 { 1864 {
1865 return DOMWindowLifecycleNotifier::create(this); 1865 return DOMWindowLifecycleNotifier::create(this);
1866 } 1866 }
1867 1867
1868 1868
1869 } // namespace WebCore 1869 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/editing/InputMethodController.cpp ('k') | Source/core/frame/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698