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

Side by Side Diff: sky/engine/core/page/Page.cpp

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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 | « sky/engine/core/page/EventHandler.cpp ('k') | sky/engine/platform/BUILD.gn » ('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, 2009, 2010, 2011, 2012, 2013 Apple Inc. All R ights Reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All R ights Reserved.
3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 if (mainFrame()->document()) 232 if (mainFrame()->document())
233 mainFrame()->document()->mediaQueryAffectingValueChanged(); 233 mainFrame()->document()->mediaQueryAffectingValueChanged();
234 setNeedsRecalcStyleInAllFrames(); 234 setNeedsRecalcStyleInAllFrames();
235 break; 235 break;
236 } 236 }
237 } 237 }
238 238
239 void Page::didCommitLoad(LocalFrame* frame) 239 void Page::didCommitLoad(LocalFrame* frame)
240 { 240 {
241 lifecycleNotifier().notifyDidCommitLoad(frame); 241 lifecycleNotifier().notifyDidCommitLoad(frame);
242 if (m_mainFrame == frame)
243 frame->console().clearMessages();
244 } 242 }
245 243
246 void Page::acceptLanguagesChanged() 244 void Page::acceptLanguagesChanged()
247 { 245 {
248 mainFrame()->domWindow()->acceptLanguagesChanged(); 246 mainFrame()->domWindow()->acceptLanguagesChanged();
249 } 247 }
250 248
251 PageLifecycleNotifier& Page::lifecycleNotifier() 249 PageLifecycleNotifier& Page::lifecycleNotifier()
252 { 250 {
253 return static_cast<PageLifecycleNotifier&>(LifecycleContext<Page>::lifecycle Notifier()); 251 return static_cast<PageLifecycleNotifier&>(LifecycleContext<Page>::lifecycle Notifier());
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 , editorClient(0) 345 , editorClient(0)
348 , spellCheckerClient(0) 346 , spellCheckerClient(0)
349 { 347 {
350 } 348 }
351 349
352 Page::PageClients::~PageClients() 350 Page::PageClients::~PageClients()
353 { 351 {
354 } 352 }
355 353
356 } // namespace blink 354 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/page/EventHandler.cpp ('k') | sky/engine/platform/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698