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

Side by Side Diff: Source/WebCore/loader/FrameLoader.cpp

Issue 13774005: Remove the ENABLE_SQL_DATABASE compile-time flag. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: python Created 7 years, 8 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/WebCore/loader/EmptyClients.h ('k') | Source/WebCore/page/ChromeClient.h » ('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 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
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) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com>
6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> 7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
8 * Copyright (C) 2011 Google Inc. All rights reserved. 8 * Copyright (C) 2011 Google Inc. All rights reserved.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
(...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after
440 if (m_frame->document() && m_frame->document()->parsing()) { 440 if (m_frame->document() && m_frame->document()->parsing()) {
441 finishedParsing(); 441 finishedParsing();
442 m_frame->document()->setParsing(false); 442 m_frame->document()->setParsing(false);
443 } 443 }
444 444
445 if (Document* doc = m_frame->document()) { 445 if (Document* doc = m_frame->document()) {
446 // FIXME: HTML5 doesn't tell us to set the state to complete when aborti ng, but we do anyway to match legacy behavior. 446 // FIXME: HTML5 doesn't tell us to set the state to complete when aborti ng, but we do anyway to match legacy behavior.
447 // http://www.w3.org/Bugs/Public/show_bug.cgi?id=10537 447 // http://www.w3.org/Bugs/Public/show_bug.cgi?id=10537
448 doc->setReadyState(Document::Complete); 448 doc->setReadyState(Document::Complete);
449 449
450 #if ENABLE(SQL_DATABASE)
451 // FIXME: Should the DatabaseManager watch for something like ActiveDOMO bject::stop() rather than being special-cased here? 450 // FIXME: Should the DatabaseManager watch for something like ActiveDOMO bject::stop() rather than being special-cased here?
452 DatabaseManager::manager().stopDatabases(doc, 0); 451 DatabaseManager::manager().stopDatabases(doc, 0);
453 #endif
454 } 452 }
455 453
456 // FIXME: This will cancel redirection timer, which really needs to be resta rted when restoring the frame from b/f cache. 454 // FIXME: This will cancel redirection timer, which really needs to be resta rted when restoring the frame from b/f cache.
457 m_frame->navigationScheduler()->cancel(); 455 m_frame->navigationScheduler()->cancel();
458 } 456 }
459 457
460 void FrameLoader::stop() 458 void FrameLoader::stop()
461 { 459 {
462 // http://bugs.webkit.org/show_bug.cgi?id=10854 460 // http://bugs.webkit.org/show_bug.cgi?id=10854
463 // The frame's last ref may be removed and it will be deleted by checkComple ted(). 461 // The frame's last ref may be removed and it will be deleted by checkComple ted().
(...skipping 2933 matching lines...) Expand 10 before | Expand all | Expand 10 after
3397 FloatRect newWindowRect = DOMWindow::adjustWindowRect(page, windowRect); 3395 FloatRect newWindowRect = DOMWindow::adjustWindowRect(page, windowRect);
3398 3396
3399 page->chrome()->setWindowRect(newWindowRect); 3397 page->chrome()->setWindowRect(newWindowRect);
3400 page->chrome()->show(); 3398 page->chrome()->show();
3401 3399
3402 created = true; 3400 created = true;
3403 return frame; 3401 return frame;
3404 } 3402 }
3405 3403
3406 } // namespace WebCore 3404 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/loader/EmptyClients.h ('k') | Source/WebCore/page/ChromeClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698