Title: [153549] trunk/Source
Revision
153549
Author
[email protected]
Date
2013-07-31 17:06:51 -0700 (Wed, 31 Jul 2013)

Log Message

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.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (153548 => 153549)


--- trunk/Source/WebCore/ChangeLog	2013-08-01 00:03:10 UTC (rev 153548)
+++ trunk/Source/WebCore/ChangeLog	2013-08-01 00:06:51 UTC (rev 153549)
@@ -1,3 +1,18 @@
+2013-07-31  Tim Horton  <[email protected]>
+
+        Remove didFinishLoad order quirk
+        https://bugs.webkit.org/show_bug.cgi?id=119354
+        <rdar://problem/11510686>
+
+        Reviewed by Alexey Proskuryakov.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::checkLoadCompleteForThisFrame):
+        Remove the quirk.
+
+        * page/Settings.in:
+        Remove the setting controlling the quirk.
+
 2013-07-31  Kwang Yul Seo  <[email protected]>
 
         Replace CRASH() on overflow with Checked<>

Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (153548 => 153549)


--- trunk/Source/WebCore/loader/FrameLoader.cpp	2013-08-01 00:03:10 UTC (rev 153548)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp	2013-08-01 00:06:51 UTC (rev 153549)
@@ -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);

Modified: trunk/Source/WebCore/page/Settings.in (153548 => 153549)


--- trunk/Source/WebCore/page/Settings.in	2013-08-01 00:03:10 UTC (rev 153548)
+++ trunk/Source/WebCore/page/Settings.in	2013-08-01 00:06:51 UTC (rev 153549)
@@ -154,7 +154,6 @@
 # support for touch adjustment.
 touchAdjustmentEnabled initial=true
 
-needsDidFinishLoadOrderQuirk initial=false
 fixedPositionCreatesStackingContext initial=false
 syncXHRInDocumentsEnabled initial=true
 cookieEnabled initial=true

Modified: trunk/Source/WebKit/mac/ChangeLog (153548 => 153549)


--- trunk/Source/WebKit/mac/ChangeLog	2013-08-01 00:03:10 UTC (rev 153548)
+++ trunk/Source/WebKit/mac/ChangeLog	2013-08-01 00:06:51 UTC (rev 153549)
@@ -1,3 +1,16 @@
+2013-07-31  Tim Horton  <[email protected]>
+
+        Remove didFinishLoad order quirk
+        https://bugs.webkit.org/show_bug.cgi?id=119354
+        <rdar://problem/11510686>
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Misc/WebKitVersionChecks.h:
+        * WebView/WebView.mm:
+        (-[WebView _preferencesChanged:]):
+        Don't set the now-removed preference.
+
 2013-07-31  Kwang Yul Seo  <[email protected]>
 
         Use emptyString instead of String("")

Modified: trunk/Source/WebKit/mac/Misc/WebKitVersionChecks.h (153548 => 153549)


--- trunk/Source/WebKit/mac/Misc/WebKitVersionChecks.h	2013-08-01 00:03:10 UTC (rev 153548)
+++ trunk/Source/WebKit/mac/Misc/WebKitVersionChecks.h	2013-08-01 00:06:51 UTC (rev 153549)
@@ -56,7 +56,6 @@
 #define WEBKIT_FIRST_VERSION_WITHOUT_LINK_ELEMENT_TEXT_CSS_QUIRK 0x02130200 // 531.2.0
 #define WEBKIT_FIRST_VERSION_WITH_HTML5_PARSER 0x02160900 // 534.9.0
 #define WEBKIT_FIRST_VERSION_WITH_GET_MATCHED_CSS_RULES_RESTRICTIONS 0x02160B00 // 534.11.0
-#define WEBKIT_FIRST_VERSION_WITH_CORRECT_DID_FINISH_LOAD_ORDER 0x02170304 // 535.3.4
 #define WEBKIT_FIRST_VERSION_WITH_CSS_ATTRIBUTE_SETTERS_IGNORING_PRIORITY 0x02170D00 // 535.13.0
 #define WEBKIT_FIRST_VERSION_WITHOUT_LEGACY_BACKGROUNDSIZE_SHORTHAND_BEHAVIOR 0x02190100 // 537.1.0
 

Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (153548 => 153549)


--- trunk/Source/WebKit/mac/WebView/WebView.mm	2013-08-01 00:03:10 UTC (rev 153548)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm	2013-08-01 00:06:51 UTC (rev 153549)
@@ -1368,12 +1368,6 @@
     return needsQuirk;
 }
 
-static bool needsDidFinishLoadOrderQuirk()
-{
-    static bool needsQuirk = !WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_CORRECT_DID_FINISH_LOAD_ORDER) && applicationIsAppleMail();
-    return needsQuirk;
-}
-
 static bool needsSelfRetainWhileLoadingQuirk()
 {
     static bool needsQuirk = applicationIsAperture();
@@ -1569,7 +1563,6 @@
     settings->setShouldRespectImageOrientation([preferences shouldRespectImageOrientation]);
     settings->setNeedsIsLoadingInAPISenseQuirk([self _needsIsLoadingInAPISenseQuirk]);
     settings->setRequestAnimationFrameEnabled([preferences requestAnimationFrameEnabled]);
-    settings->setNeedsDidFinishLoadOrderQuirk(needsDidFinishLoadOrderQuirk());
     settings->setDiagnosticLoggingEnabled([preferences diagnosticLoggingEnabled]);
     settings->setLowPowerVideoAudioBufferSizeEnabled([preferences lowPowerVideoAudioBufferSizeEnabled]);
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to