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
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index bedd887..80b9f8c 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2013-07-31 Tim Horton <timothy_horton@apple.com>
+
+ 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 <skyul@company100.net>
Replace CRASH() on overflow with Checked<>
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);
diff --git a/Source/WebCore/page/Settings.in b/Source/WebCore/page/Settings.in
index dd51d68..1498b2c 100644
--- a/Source/WebCore/page/Settings.in
+++ b/Source/WebCore/page/Settings.in
@@ -154,7 +154,6 @@
# support for touch adjustment.
touchAdjustmentEnabled initial=true
-needsDidFinishLoadOrderQuirk initial=false
fixedPositionCreatesStackingContext initial=false
syncXHRInDocumentsEnabled initial=true
cookieEnabled initial=true
diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
index 1068a55..13ba99b 100644
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,16 @@
+2013-07-31 Tim Horton <timothy_horton@apple.com>
+
+ 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 <skyul@company100.net>
Use emptyString instead of String("")
diff --git a/Source/WebKit/mac/Misc/WebKitVersionChecks.h b/Source/WebKit/mac/Misc/WebKitVersionChecks.h
index 5f79099..24b647a 100644
--- a/Source/WebKit/mac/Misc/WebKitVersionChecks.h
+++ b/Source/WebKit/mac/Misc/WebKitVersionChecks.h
@@ -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
diff --git a/Source/WebKit/mac/WebView/WebView.mm b/Source/WebKit/mac/WebView/WebView.mm
index 2f02074..552cb9de 100644
--- a/Source/WebKit/mac/WebView/WebView.mm
+++ b/Source/WebKit/mac/WebView/WebView.mm
@@ -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]);
