Title: [153434] trunk/Source/WebKit2
- Revision
- 153434
- Author
- [email protected]
- Date
- 2013-07-29 11:10:32 -0700 (Mon, 29 Jul 2013)
Log Message
Remove setUnderlayPage() and associated code
https://bugs.webkit.org/show_bug.cgi?id=119220
<rdar://problem/14392426>
Reviewed by Jessie Berlin.
This is dead code, get rid of it.
* WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
* WebProcess/InjectedBundle/API/c/WKBundlePage.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::close):
(WebKit::WebPage::layoutIfNeeded):
(WebKit::WebPage::drawRect):
* WebProcess/WebPage/WebPage.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (153433 => 153434)
--- trunk/Source/WebKit2/ChangeLog 2013-07-29 17:45:51 UTC (rev 153433)
+++ trunk/Source/WebKit2/ChangeLog 2013-07-29 18:10:32 UTC (rev 153434)
@@ -1,3 +1,21 @@
+2013-07-29 Anders Carlsson <[email protected]>
+
+ Remove setUnderlayPage() and associated code
+ https://bugs.webkit.org/show_bug.cgi?id=119220
+ <rdar://problem/14392426>
+
+ Reviewed by Jessie Berlin.
+
+ This is dead code, get rid of it.
+
+ * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
+ * WebProcess/InjectedBundle/API/c/WKBundlePage.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::close):
+ (WebKit::WebPage::layoutIfNeeded):
+ (WebKit::WebPage::drawRect):
+ * WebProcess/WebPage/WebPage.h:
+
2013-07-29 Sergio Correia <[email protected]>
CoordinatedGraphics: Add API to get and set the active state of a WebView
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp (153433 => 153434)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2013-07-29 17:45:51 UTC (rev 153433)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2013-07-29 18:10:32 UTC (rev 153434)
@@ -305,11 +305,6 @@
return toAPI(toImpl(pageRef)->backForwardList());
}
-void WKBundlePageSetUnderlayPage(WKBundlePageRef pageRef, WKBundlePageRef pageUnderlayRef)
-{
- toImpl(pageRef)->setUnderlayPage(toImpl(pageUnderlayRef));
-}
-
void WKBundlePageInstallPageOverlay(WKBundlePageRef pageRef, WKBundlePageOverlayRef pageOverlayRef)
{
toImpl(pageRef)->installPageOverlay(toImpl(pageOverlayRef));
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h (153433 => 153434)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h 2013-07-29 17:45:51 UTC (rev 153433)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h 2013-07-29 18:10:32 UTC (rev 153434)
@@ -437,8 +437,6 @@
WK_EXPORT WKBundleBackForwardListRef WKBundlePageGetBackForwardList(WKBundlePageRef page);
-WK_EXPORT void WKBundlePageSetUnderlayPage(WKBundlePageRef page, WKBundlePageRef pageUnderlay);
-
WK_EXPORT void WKBundlePageInstallPageOverlay(WKBundlePageRef page, WKBundlePageOverlayRef pageOverlay);
WK_EXPORT void WKBundlePageUninstallPageOverlay(WKBundlePageRef page, WKBundlePageOverlayRef pageOverlay);
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (153433 => 153434)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-07-29 17:45:51 UTC (rev 153433)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-07-29 18:10:32 UTC (rev 153434)
@@ -869,7 +869,6 @@
#endif
m_logDiagnosticMessageClient.initialize(0);
- m_underlayPage = nullptr;
m_printContext = nullptr;
m_mainFrame->coreFrame()->loader()->detachFromParent();
m_page = nullptr;
@@ -1067,11 +1066,6 @@
{
if (m_mainFrame->coreFrame()->view())
m_mainFrame->coreFrame()->view()->updateLayoutAndStyleIfNeededRecursive();
-
- if (m_underlayPage) {
- if (FrameView *frameView = m_underlayPage->mainFrameView())
- frameView->updateLayoutAndStyleIfNeededRecursive();
- }
}
WebPage* WebPage::fromCorePage(Page* page)
@@ -1178,15 +1172,6 @@
GraphicsContextStateSaver stateSaver(graphicsContext);
graphicsContext.clip(rect);
- if (m_underlayPage) {
- m_underlayPage->drawRect(graphicsContext, rect);
-
- graphicsContext.beginTransparencyLayer(1);
- m_mainFrame->coreFrame()->view()->paint(&graphicsContext, rect);
- graphicsContext.endTransparencyLayer();
- return;
- }
-
m_mainFrame->coreFrame()->view()->paint(&graphicsContext, rect);
}
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (153433 => 153434)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2013-07-29 17:45:51 UTC (rev 153433)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2013-07-29 18:10:32 UTC (rev 153434)
@@ -273,8 +273,6 @@
InjectedBundlePageFullScreenClient& injectedBundleFullScreenClient() { return m_fullScreenClient; }
#endif
- void setUnderlayPage(PassRefPtr<WebPage> underlayPage) { m_underlayPage = underlayPage; }
-
bool findStringFromInjectedBundle(const String&, FindOptions);
WebFrame* mainWebFrame() const { return m_mainFrame.get(); }
@@ -961,8 +959,6 @@
#endif
PageOverlayList m_pageOverlays;
- RefPtr<WebPage> m_underlayPage;
-
#if ENABLE(INSPECTOR)
RefPtr<WebInspector> m_inspector;
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes