commit 346f8d791c31b2356a17b7bec82a6d0898841036
author timothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Thu Aug 01 00:06:51 2013 +0000
committer timothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Thu Aug 01 00:06:51 2013 +0000
tree c9a7d1535c7a790935ed12c9ba5616f24a594838
parent f47bf5ae6af56abacb50c4184b3ecebeac015ed7

Remove didFinishLoad order quirk
https://bugs.webkit.org/show_bug.cgi?id=119354
<rdar://problem/11510686>

Reviewed by Alexey Proskuryakov.

Source/WebCore:

* loader/FrameLoader.cpp:
(WebCore::FrameLoader::checkLoadCompleteForThisFrame):
Remove the quirk.

* page/Settings.in:
Remove the setting controlling the quirk.

Source/WebKit/mac:

* Misc/WebKitVersionChecks.h:
* WebView/WebView.mm:
(-[WebView _preferencesChanged:]):
Don't set the now-removed preference.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@153549 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/loader/FrameLoader.cpp

diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp
index 3a7cc0f..ffdb38b 100644
--- a/Source/WebCore/loader/FrameLoader.cpp
+++ b/Source/WebCore/loader/FrameLoader.cpp
@@ -2100,8 +2100,6 @@
 {
     ASSERT(m_client->hasWebView());
 
-    Settings* settings = m_frame->settings();
-
     switch (m_state) {
         case FrameStateProvisional: {
             if (m_delegateIsHandlingProvisionalLoadError)
@@ -2176,12 +2174,10 @@
             if (m_stateMachine.creatingInitialEmptyDocument() || !m_stateMachine.committedFirstRealDocumentLoad())
                 return;
 
-            if (!settings->needsDidFinishLoadOrderQuirk()) {
-                m_progressTracker->progressCompleted();
-                if (Page* page = m_frame->page()) {
-                    if (m_frame == page->mainFrame())
-                        page->resetRelevantPaintedObjectCounter();
-                }
+            m_progressTracker->progressCompleted();
+            if (Page* page = m_frame->page()) {
+                if (m_frame == page->mainFrame())
+                    page->resetRelevantPaintedObjectCounter();
             }
 
             const ResourceError& error = dl->mainDocumentError();
@@ -2195,14 +2191,6 @@
                 loadingEvent = AXObjectCache::AXLoadingFinished;
             }
 
-            if (settings->needsDidFinishLoadOrderQuirk()) {
-                m_progressTracker->progressCompleted();
-                if (Page* page = m_frame->page()) {
-                    if (m_frame == page->mainFrame())
-                        page->resetRelevantPaintedObjectCounter();
-                }
-            }
-
             // Notify accessibility.
             if (AXObjectCache* cache = m_frame->document()->existingAXObjectCache())
                 cache->frameLoadingEventNotification(m_frame, loadingEvent);