Modified: trunk/Source/WebKit/ChangeLog (242309 => 242310)
--- trunk/Source/WebKit/ChangeLog 2019-03-02 06:09:31 UTC (rev 242309)
+++ trunk/Source/WebKit/ChangeLog 2019-03-02 16:28:46 UTC (rev 242310)
@@ -1,3 +1,17 @@
+2019-03-02 Michael Catanzaro <[email protected]>
+
+ Remove unused WebPageProxy::m_navigationID
+ https://bugs.webkit.org/show_bug.cgi?id=195209
+
+ Reviewed by Darin Adler.
+
+ WebPageProxy::m_navigationID is never assigned to and is only used once by mistake in a
+ debug LOG(). It must be a refactoring mistake.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didCommitLoadForFrame):
+ * UIProcess/WebPageProxy.h:
+
2019-03-01 Darin Adler <[email protected]>
Finish removing String::format
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (242309 => 242310)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2019-03-02 06:09:31 UTC (rev 242309)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2019-03-02 16:28:46 UTC (rev 242310)
@@ -4057,7 +4057,7 @@
void WebPageProxy::didCommitLoadForFrame(uint64_t frameID, uint64_t navigationID, const String& mimeType, bool frameHasCustomContentProvider, uint32_t opaqueFrameLoadType, const WebCore::CertificateInfo& certificateInfo, bool containsPluginDocument, Optional<HasInsecureContent> hasInsecureContent, const UserData& userData)
{
- LOG(Loading, "(Loading) WebPageProxy %" PRIu64 " didCommitLoadForFrame in navigation %" PRIu64, m_pageID, m_navigationID);
+ LOG(Loading, "(Loading) WebPageProxy %" PRIu64 " didCommitLoadForFrame in navigation %" PRIu64, m_pageID, navigationID);
LOG(BackForward, "(Back/Forward) After load commit, back/forward list is now:%s", m_backForwardList->loggingString());
RELEASE_LOG_IF_ALLOWED(Loading, "didCommitLoadForFrame: webPID = %i, pageID = %" PRIu64 ", frameID = %" PRIu64, m_process->processIdentifier(), m_pageID, frameID);
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (242309 => 242310)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2019-03-02 06:09:31 UTC (rev 242309)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2019-03-02 16:28:46 UTC (rev 242310)
@@ -2312,7 +2312,6 @@
WebCore::ScrollPinningBehavior m_scrollPinningBehavior { WebCore::DoNotPin };
Optional<WebCore::ScrollbarOverlayStyle> m_scrollbarOverlayStyle;
- uint64_t m_navigationID { 0 };
ActivityStateChangeID m_currentActivityStateChangeID { ActivityStateChangeAsynchronous };
WebPreferencesStore::ValueMap m_configurationPreferenceValues;
