Diff
Modified: trunk/Source/WebCore/ChangeLog (237137 => 237138)
--- trunk/Source/WebCore/ChangeLog 2018-10-15 19:53:47 UTC (rev 237137)
+++ trunk/Source/WebCore/ChangeLog 2018-10-15 19:55:39 UTC (rev 237138)
@@ -1,3 +1,17 @@
+2018-10-15 Alex Christensen <[email protected]>
+
+ Remove unused parameters from FrameLoaderClient::createFrame
+ https://bugs.webkit.org/show_bug.cgi?id=190587
+
+ Reviewed by Chris Dumez.
+
+ * loader/EmptyClients.cpp:
+ (WebCore::EmptyFrameLoaderClient::createFrame):
+ * loader/EmptyFrameLoaderClient.h:
+ * loader/FrameLoaderClient.h:
+ * loader/SubframeLoader.cpp:
+ (WebCore::SubframeLoader::loadSubframe):
+
2018-10-15 Andy Estes <[email protected]>
[Apple Pay] Payment authorization results with ApplePayErrors should never be considered final
Modified: trunk/Source/WebCore/loader/EmptyClients.cpp (237137 => 237138)
--- trunk/Source/WebCore/loader/EmptyClients.cpp 2018-10-15 19:53:47 UTC (rev 237137)
+++ trunk/Source/WebCore/loader/EmptyClients.cpp 2018-10-15 19:55:39 UTC (rev 237138)
@@ -468,7 +468,7 @@
return DocumentLoader::create(request, substituteData);
}
-RefPtr<Frame> EmptyFrameLoaderClient::createFrame(const URL&, const String&, HTMLFrameOwnerElement&, const String&, bool, int, int)
+RefPtr<Frame> EmptyFrameLoaderClient::createFrame(const URL&, const String&, HTMLFrameOwnerElement&, const String&)
{
return nullptr;
}
Modified: trunk/Source/WebCore/loader/EmptyFrameLoaderClient.h (237137 => 237138)
--- trunk/Source/WebCore/loader/EmptyFrameLoaderClient.h 2018-10-15 19:53:47 UTC (rev 237137)
+++ trunk/Source/WebCore/loader/EmptyFrameLoaderClient.h 2018-10-15 19:55:39 UTC (rev 237138)
@@ -172,7 +172,7 @@
void didDisplayInsecureContent() final { }
void didRunInsecureContent(SecurityOrigin&, const URL&) final { }
void didDetectXSS(const URL&, bool) final { }
- RefPtr<Frame> createFrame(const URL&, const String&, HTMLFrameOwnerElement&, const String&, bool, int, int) final;
+ RefPtr<Frame> createFrame(const URL&, const String&, HTMLFrameOwnerElement&, const String&) final;
RefPtr<Widget> createPlugin(const IntSize&, HTMLPlugInElement&, const URL&, const Vector<String>&, const Vector<String>&, const String&, bool) final;
void recreatePlugin(Widget*) final;
RefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement&, const URL&, const Vector<String>&, const Vector<String>&) final;
Modified: trunk/Source/WebCore/loader/FrameLoaderClient.h (237137 => 237138)
--- trunk/Source/WebCore/loader/FrameLoaderClient.h 2018-10-15 19:53:47 UTC (rev 237137)
+++ trunk/Source/WebCore/loader/FrameLoaderClient.h 2018-10-15 19:55:39 UTC (rev 237138)
@@ -289,7 +289,7 @@
virtual bool canCachePage() const = 0;
virtual void convertMainResourceLoadToDownload(DocumentLoader*, PAL::SessionID, const ResourceRequest&, const ResourceResponse&) = 0;
- virtual RefPtr<Frame> createFrame(const URL&, const String& name, HTMLFrameOwnerElement&, const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight) = 0;
+ virtual RefPtr<Frame> createFrame(const URL&, const String& name, HTMLFrameOwnerElement&, const String& referrer) = 0;
virtual RefPtr<Widget> createPlugin(const IntSize&, HTMLPlugInElement&, const URL&, const Vector<String>&, const Vector<String>&, const String&, bool loadManually) = 0;
virtual void recreatePlugin(Widget*) = 0;
virtual void redirectDataToPlugin(Widget&) = 0;
Modified: trunk/Source/WebCore/loader/SubframeLoader.cpp (237137 => 237138)
--- trunk/Source/WebCore/loader/SubframeLoader.cpp 2018-10-15 19:53:47 UTC (rev 237137)
+++ trunk/Source/WebCore/loader/SubframeLoader.cpp 2018-10-15 19:55:39 UTC (rev 237138)
@@ -308,17 +308,6 @@
Frame* SubframeLoader::loadSubframe(HTMLFrameOwnerElement& ownerElement, const URL& url, const String& name, const String& referrer)
{
Ref<Frame> protect(m_frame);
-
- bool allowsScrolling = true;
- int marginWidth = -1;
- int marginHeight = -1;
- if (is<HTMLFrameElementBase>(ownerElement)) {
- auto& frameElementBase = downcast<HTMLFrameElementBase>(ownerElement);
- allowsScrolling = frameElementBase.scrollingMode() != ScrollbarAlwaysOff;
- marginWidth = frameElementBase.marginWidth();
- marginHeight = frameElementBase.marginHeight();
- }
-
auto document = makeRef(ownerElement.document());
if (!document->securityOrigin().canDisplay(url)) {
@@ -334,7 +323,7 @@
// Prevent initial empty document load from triggering load events.
document->incrementLoadEventDelayCount();
- auto frame = m_frame.loader().client().createFrame(url, name, ownerElement, referrerToUse, allowsScrolling, marginWidth, marginHeight);
+ auto frame = m_frame.loader().client().createFrame(url, name, ownerElement, referrerToUse);
document->decrementLoadEventDelayCount();
Modified: trunk/Source/WebKit/ChangeLog (237137 => 237138)
--- trunk/Source/WebKit/ChangeLog 2018-10-15 19:53:47 UTC (rev 237137)
+++ trunk/Source/WebKit/ChangeLog 2018-10-15 19:55:39 UTC (rev 237138)
@@ -1,3 +1,14 @@
+2018-10-15 Alex Christensen <[email protected]>
+
+ Remove unused parameters from FrameLoaderClient::createFrame
+ https://bugs.webkit.org/show_bug.cgi?id=190587
+
+ Reviewed by Chris Dumez.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::createFrame):
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
+
2018-10-15 Wenson Hsieh <[email protected]>
[iOS] Can't select text after dismissing the keyboard when changing focus
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (237137 => 237138)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2018-10-15 19:53:47 UTC (rev 237137)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2018-10-15 19:55:39 UTC (rev 237138)
@@ -1488,7 +1488,7 @@
}
RefPtr<Frame> WebFrameLoaderClient::createFrame(const URL& url, const String& name, HTMLFrameOwnerElement& ownerElement,
- const String& referrer, bool /*allowsScrolling*/, int /*marginWidth*/, int /*marginHeight*/)
+ const String& referrer)
{
auto* webPage = m_frame->page();
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.h (237137 => 237138)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2018-10-15 19:53:47 UTC (rev 237137)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2018-10-15 19:55:39 UTC (rev 237138)
@@ -210,7 +210,7 @@
bool canCachePage() const final;
void convertMainResourceLoadToDownload(WebCore::DocumentLoader*, PAL::SessionID, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&) final;
- RefPtr<WebCore::Frame> createFrame(const WebCore::URL&, const String& name, WebCore::HTMLFrameOwnerElement&, const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight) final;
+ RefPtr<WebCore::Frame> createFrame(const WebCore::URL&, const String& name, WebCore::HTMLFrameOwnerElement&, const String& referrer) final;
RefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement&, const WebCore::URL&, const Vector<String>&, const Vector<String>&, const String&, bool loadManually) final;
void recreatePlugin(WebCore::Widget*) final;
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (237137 => 237138)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2018-10-15 19:53:47 UTC (rev 237137)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2018-10-15 19:55:39 UTC (rev 237138)
@@ -1,5 +1,16 @@
2018-10-15 Alex Christensen <[email protected]>
+ Remove unused parameters from FrameLoaderClient::createFrame
+ https://bugs.webkit.org/show_bug.cgi?id=190587
+
+ Reviewed by Chris Dumez.
+
+ * WebCoreSupport/WebFrameLoaderClient.h:
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ (WebFrameLoaderClient::createFrame):
+
+2018-10-15 Alex Christensen <[email protected]>
+
Remove unused WebFrame._loadType
https://bugs.webkit.org/show_bug.cgi?id=190583
Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.h (237137 => 237138)
--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.h 2018-10-15 19:53:47 UTC (rev 237137)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.h 2018-10-15 19:55:39 UTC (rev 237138)
@@ -209,7 +209,7 @@
void setTitle(const WebCore::StringWithDirection&, const WebCore::URL&) final;
RefPtr<WebCore::Frame> createFrame(const WebCore::URL&, const WTF::String& name, WebCore::HTMLFrameOwnerElement&,
- const WTF::String& referrer, bool allowsScrolling, int marginWidth, int marginHeight) final;
+ const WTF::String& referrer) final;
RefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement&, const WebCore::URL&,
const Vector<WTF::String>&, const Vector<WTF::String>&, const WTF::String&, bool) final;
void recreatePlugin(WebCore::Widget*) final;
Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm (237137 => 237138)
--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm 2018-10-15 19:53:47 UTC (rev 237137)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm 2018-10-15 19:55:39 UTC (rev 237138)
@@ -1628,7 +1628,7 @@
}
RefPtr<Frame> WebFrameLoaderClient::createFrame(const URL& url, const String& name, HTMLFrameOwnerElement& ownerElement,
- const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight)
+ const String& referrer)
{
BEGIN_BLOCK_OBJC_EXCEPTIONS;
Modified: trunk/Source/WebKitLegacy/win/ChangeLog (237137 => 237138)
--- trunk/Source/WebKitLegacy/win/ChangeLog 2018-10-15 19:53:47 UTC (rev 237137)
+++ trunk/Source/WebKitLegacy/win/ChangeLog 2018-10-15 19:55:39 UTC (rev 237138)
@@ -1,3 +1,14 @@
+2018-10-15 Alex Christensen <[email protected]>
+
+ Remove unused parameters from FrameLoaderClient::createFrame
+ https://bugs.webkit.org/show_bug.cgi?id=190587
+
+ Reviewed by Chris Dumez.
+
+ * WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebFrameLoaderClient::createFrame):
+ * WebCoreSupport/WebFrameLoaderClient.h:
+
2018-10-15 Chris Dumez <[email protected]>
Unreviewed Windows build fix after r237112.
Modified: trunk/Source/WebKitLegacy/win/WebCoreSupport/WebFrameLoaderClient.cpp (237137 => 237138)
--- trunk/Source/WebKitLegacy/win/WebCoreSupport/WebFrameLoaderClient.cpp 2018-10-15 19:53:47 UTC (rev 237137)
+++ trunk/Source/WebKitLegacy/win/WebCoreSupport/WebFrameLoaderClient.cpp 2018-10-15 19:55:39 UTC (rev 237138)
@@ -1026,7 +1026,7 @@
}
RefPtr<Frame> WebFrameLoaderClient::createFrame(const URL& url, const String& name, HTMLFrameOwnerElement& ownerElement,
- const String& referrer, bool /*allowsScrolling*/, int /*marginWidth*/, int /*marginHeight*/)
+ const String& referrer)
{
Frame* coreFrame = core(m_webFrame);
ASSERT(coreFrame);
Modified: trunk/Source/WebKitLegacy/win/WebCoreSupport/WebFrameLoaderClient.h (237137 => 237138)
--- trunk/Source/WebKitLegacy/win/WebCoreSupport/WebFrameLoaderClient.h 2018-10-15 19:53:47 UTC (rev 237137)
+++ trunk/Source/WebKitLegacy/win/WebCoreSupport/WebFrameLoaderClient.h 2018-10-15 19:55:39 UTC (rev 237138)
@@ -186,7 +186,7 @@
bool canCachePage() const override;
RefPtr<WebCore::Frame> createFrame(const WebCore::URL&, const WTF::String& name, WebCore::HTMLFrameOwnerElement&,
- const WTF::String& referrer, bool allowsScrolling, int marginWidth, int marginHeight) override;
+ const WTF::String& referrer) override;
RefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement&, const WebCore::URL&, const Vector<WTF::String>&, const Vector<WTF::String>&, const WTF::String&, bool loadManually) override;
void recreatePlugin(WebCore::Widget*) override { }
void redirectDataToPlugin(WebCore::Widget&) override;
