<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[185878] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/185878">185878</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-06-23 10:37:15 -0700 (Tue, 23 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of the window resizer size
https://bugs.webkit.org/show_bug.cgi?id=146240
Reviewed by Darin Adler.
This code was only used by older versions of GTK+, so get rid of it.
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseNotifyResizerSize): Deleted.
(toplevelWindowResizeGripVisibilityChanged): Deleted.
(webkitWebViewBaseSetToplevelOnScreenWindow): Deleted.
(resizeWebKitWebViewBaseFromAllocation): Deleted.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::setWindowResizerSize): Deleted.
* UIProcess/WebPageProxy.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::windowResizerRect):
(WebKit::WebPage::setWindowResizerSize): Deleted.
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185877 => 185878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-23 17:28:20 UTC (rev 185877)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-23 17:37:15 UTC (rev 185878)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-06-23 Anders Carlsson <andersca@apple.com>
+
+ Get rid of the window resizer size
+ https://bugs.webkit.org/show_bug.cgi?id=146240
+
+ Reviewed by Darin Adler.
+
+ This code was only used by older versions of GTK+, so get rid of it.
+
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewBaseNotifyResizerSize): Deleted.
+ (toplevelWindowResizeGripVisibilityChanged): Deleted.
+ (webkitWebViewBaseSetToplevelOnScreenWindow): Deleted.
+ (resizeWebKitWebViewBaseFromAllocation): Deleted.
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::setWindowResizerSize): Deleted.
+ * UIProcess/WebPageProxy.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::windowResizerRect):
+ (WebKit::WebPage::setWindowResizerSize): Deleted.
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+
</ins><span class="cx"> 2015-06-23 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> WKFrameInfo should have an accessor for the Frame's current security origin.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (185877 => 185878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2015-06-23 17:28:20 UTC (rev 185877)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2015-06-23 17:37:15 UTC (rev 185878)
</span><span class="lines">@@ -154,9 +154,6 @@
</span><span class="cx"> ClickCounter clickCounter;
</span><span class="cx"> CString tooltipText;
</span><span class="cx"> IntRect tooltipArea;
</span><del>-#if !GTK_CHECK_VERSION(3, 13, 4)
- IntSize resizerSize;
-#endif
</del><span class="cx"> GRefPtr<AtkObject> accessible;
</span><span class="cx"> bool needsResizeOnMap;
</span><span class="cx"> GtkWidget* authenticationDialog;
</span><span class="lines">@@ -170,9 +167,6 @@
</span><span class="cx"> TouchEventsMap touchEvents;
</span><span class="cx">
</span><span class="cx"> GtkWindow* toplevelOnScreenWindow;
</span><del>-#if !GTK_CHECK_VERSION(3, 13, 4)
- unsigned long toplevelResizeGripVisibilityID;
-#endif
</del><span class="cx"> unsigned long toplevelFocusInEventID;
</span><span class="cx"> unsigned long toplevelFocusOutEventID;
</span><span class="cx"> unsigned long toplevelVisibilityEventID;
</span><span class="lines">@@ -208,38 +202,6 @@
</span><span class="cx">
</span><span class="cx"> WEBKIT_DEFINE_TYPE(WebKitWebViewBase, webkit_web_view_base, GTK_TYPE_CONTAINER)
</span><span class="cx">
</span><del>-#if !GTK_CHECK_VERSION(3, 13, 4)
-static void webkitWebViewBaseNotifyResizerSize(WebKitWebViewBase* webViewBase)
-{
- WebKitWebViewBasePrivate* priv = webViewBase->priv;
- if (!priv->toplevelOnScreenWindow)
- return;
-
- gboolean resizerVisible;
- g_object_get(G_OBJECT(priv->toplevelOnScreenWindow), "resize-grip-visible", &resizerVisible, NULL);
-
- IntSize resizerSize;
- if (resizerVisible) {
- GdkRectangle resizerRect;
- gtk_window_get_resize_grip_area(priv->toplevelOnScreenWindow, &resizerRect);
- GdkRectangle allocation;
- gtk_widget_get_allocation(GTK_WIDGET(webViewBase), &allocation);
- if (gdk_rectangle_intersect(&resizerRect, &allocation, 0))
- resizerSize = IntSize(resizerRect.width, resizerRect.height);
- }
-
- if (resizerSize != priv->resizerSize) {
- priv->resizerSize = resizerSize;
- priv->pageProxy->setWindowResizerSize(resizerSize);
- }
-}
-
-static void toplevelWindowResizeGripVisibilityChanged(GObject*, GParamSpec*, WebKitWebViewBase* webViewBase)
-{
- webkitWebViewBaseNotifyResizerSize(webViewBase);
-}
-#endif
-
</del><span class="cx"> static gboolean toplevelWindowFocusInEvent(GtkWidget*, GdkEventFocus*, WebKitWebViewBase* webViewBase)
</span><span class="cx"> {
</span><span class="cx"> WebKitWebViewBasePrivate* priv = webViewBase->priv;
</span><span class="lines">@@ -280,12 +242,6 @@
</span><span class="cx"> if (priv->toplevelOnScreenWindow == window)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if !GTK_CHECK_VERSION(3, 13, 4)
- if (priv->toplevelResizeGripVisibilityID) {
- g_signal_handler_disconnect(priv->toplevelOnScreenWindow, priv->toplevelResizeGripVisibilityID);
- priv->toplevelResizeGripVisibilityID = 0;
- }
-#endif
</del><span class="cx"> if (priv->toplevelFocusInEventID) {
</span><span class="cx"> g_signal_handler_disconnect(priv->toplevelOnScreenWindow, priv->toplevelFocusInEventID);
</span><span class="cx"> priv->toplevelFocusInEventID = 0;
</span><span class="lines">@@ -304,13 +260,6 @@
</span><span class="cx"> if (!priv->toplevelOnScreenWindow)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if !GTK_CHECK_VERSION(3, 13, 4)
- webkitWebViewBaseNotifyResizerSize(webViewBase);
-
- priv->toplevelResizeGripVisibilityID =
- g_signal_connect(priv->toplevelOnScreenWindow, "notify::resize-grip-visible",
- G_CALLBACK(toplevelWindowResizeGripVisibilityChanged), webViewBase);
-#endif
</del><span class="cx"> priv->toplevelFocusInEventID =
</span><span class="cx"> g_signal_connect(priv->toplevelOnScreenWindow, "focus-in-event",
</span><span class="cx"> G_CALLBACK(toplevelWindowFocusInEvent), webViewBase);
</span><span class="lines">@@ -655,10 +604,6 @@
</span><span class="cx">
</span><span class="cx"> if (drawingArea)
</span><span class="cx"> drawingArea->setSize(viewRect.size(), IntSize(), IntSize());
</span><del>-
-#if !GTK_CHECK_VERSION(3, 13, 4)
- webkitWebViewBaseNotifyResizerSize(webViewBase);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void webkitWebViewBaseSizeAllocate(GtkWidget* widget, GtkAllocation* allocation)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (185877 => 185878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-06-23 17:28:20 UTC (rev 185877)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-06-23 17:37:15 UTC (rev 185878)
</span><span class="lines">@@ -1487,13 +1487,6 @@
</span><span class="cx"> m_process->send(Messages::WebPage::SetInitialFocus(forward, isKeyboardEventValid, keyboardEvent, callbackID), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::setWindowResizerSize(const IntSize& windowResizerSize)
-{
- if (!isValid())
- return;
- m_process->send(Messages::WebPage::SetWindowResizerSize(windowResizerSize), m_pageID);
-}
-
</del><span class="cx"> void WebPageProxy::clearSelection()
</span><span class="cx"> {
</span><span class="cx"> if (!isValid())
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (185877 => 185878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-06-23 17:28:20 UTC (rev 185877)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-06-23 17:37:15 UTC (rev 185878)
</span><span class="lines">@@ -404,7 +404,6 @@
</span><span class="cx"> void viewWillEndLiveResize();
</span><span class="cx">
</span><span class="cx"> void setInitialFocus(bool forward, bool isKeyboardEventValid, const WebKeyboardEvent&, std::function<void (CallbackBase::Error)>);
</span><del>- void setWindowResizerSize(const WebCore::IntSize&);
</del><span class="cx">
</span><span class="cx"> void clearSelection();
</span><span class="cx"> void restoreSelectionInFocusedEditableElement();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (185877 => 185878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-06-23 17:28:20 UTC (rev 185877)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-06-23 17:37:15 UTC (rev 185878)
</span><span class="lines">@@ -2323,20 +2323,6 @@
</span><span class="cx"> send(Messages::WebPageProxy::VoidCallback(callbackID));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::setWindowResizerSize(const IntSize& windowResizerSize)
-{
- if (m_windowResizerSize == windowResizerSize)
- return;
-
- m_windowResizerSize = windowResizerSize;
-
- for (Frame* coreFrame = m_mainFrame->coreFrame(); coreFrame; coreFrame = coreFrame->tree().traverseNext()) {
- FrameView* view = coreFrame->view();
- if (view)
- view->windowResizerRectChanged();
- }
-}
-
</del><span class="cx"> void WebPage::setCanStartMediaTimerFired()
</span><span class="cx"> {
</span><span class="cx"> if (m_page)
</span><span class="lines">@@ -2509,17 +2495,7 @@
</span><span class="cx">
</span><span class="cx"> IntRect WebPage::windowResizerRect() const
</span><span class="cx"> {
</span><del>- if (m_windowResizerSize.isEmpty())
- return IntRect();
-
- IntSize frameViewSize;
- if (Frame* coreFrame = m_mainFrame->coreFrame()) {
- if (FrameView* view = coreFrame->view())
- frameViewSize = view->size();
- }
-
- return IntRect(frameViewSize.width() - m_windowResizerSize.width(), frameViewSize.height() - m_windowResizerSize.height(),
- m_windowResizerSize.width(), m_windowResizerSize.height());
</del><ins>+ return IntRect();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> KeyboardUIMode WebPage::keyboardUIMode()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (185877 => 185878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-06-23 17:28:20 UTC (rev 185877)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-06-23 17:37:15 UTC (rev 185878)
</span><span class="lines">@@ -959,7 +959,6 @@
</span><span class="cx"> void goToBackForwardItem(uint64_t navigationID, uint64_t);
</span><span class="cx"> void tryRestoreScrollPosition();
</span><span class="cx"> void setInitialFocus(bool forward, bool isKeyboardEventValid, const WebKeyboardEvent&, uint64_t callbackID);
</span><del>- void setWindowResizerSize(const WebCore::IntSize&);
</del><span class="cx"> void updateIsInWindow(bool isInitialState = false);
</span><span class="cx"> void setViewState(WebCore::ViewState::Flags, bool wantsDidUpdateViewState, const Vector<uint64_t>& callbackIDs);
</span><span class="cx"> void validateCommand(const String&, uint64_t);
</span><span class="lines">@@ -1229,8 +1228,6 @@
</span><span class="cx">
</span><span class="cx"> HashMap<uint64_t, RefPtr<WebUndoStep>> m_undoStepMap;
</span><span class="cx">
</span><del>- WebCore::IntSize m_windowResizerSize;
-
</del><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><span class="cx"> std::unique_ptr<API::InjectedBundle::PageContextMenuClient> m_contextMenuClient;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (185877 => 185878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-06-23 17:28:20 UTC (rev 185877)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-06-23 17:37:15 UTC (rev 185878)
</span><span class="lines">@@ -292,8 +292,6 @@
</span><span class="cx"> # Notification
</span><span class="cx"> DidReceiveNotificationPermissionDecision(uint64_t notificationID, bool allowed)
</span><span class="cx">
</span><del>- SetWindowResizerSize(WebCore::IntSize intersectsView)
-
</del><span class="cx"> # Printing.
</span><span class="cx"> BeginPrinting(uint64_t frameID, struct WebKit::PrintInfo printInfo)
</span><span class="cx"> EndPrinting()
</span></span></pre>
</div>
</div>
</body>
</html>