<!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>[162655] 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/162655">162655</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-01-23 15:28:54 -0800 (Thu, 23 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up WKView.mm a little
https://bugs.webkit.org/show_bug.cgi?id=127517
Reviewed by Tim Horton.
Remove an unused ivar and migrate to API constants that were added in Lion.
* UIProcess/API/mac/WKView.mm:
(-[WKView setFrameSize:]):
(-[WKView addWindowObserversForWindow:]):
(-[WKView removeWindowObservers]):
(-[WKView viewDidMoveToWindow]):
(-[WKView _windowDidMiniaturize:]):
(-[WKView _windowDidResize:]):
(-[WKView _windowDidChangeBackingProperties:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (162654 => 162655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-23 23:23:51 UTC (rev 162654)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-23 23:28:54 UTC (rev 162655)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2014-01-23 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Clean up WKView.mm a little
+ https://bugs.webkit.org/show_bug.cgi?id=127517
+
+ Reviewed by Tim Horton.
+
+ Remove an unused ivar and migrate to API constants that were added in Lion.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView setFrameSize:]):
+ (-[WKView addWindowObserversForWindow:]):
+ (-[WKView removeWindowObservers]):
+ (-[WKView viewDidMoveToWindow]):
+ (-[WKView _windowDidMiniaturize:]):
+ (-[WKView _windowDidResize:]):
+ (-[WKView _windowDidChangeBackingProperties:]):
+
+2014-01-23 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Try to fix the 32-bit build.
</span><span class="cx">
</span><span class="cx"> * UIProcess/API/Cocoa/WKPreferences.mm:
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (162654 => 162655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-01-23 23:23:51 UTC (rev 162654)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-01-23 23:28:54 UTC (rev 162655)
</span><span class="lines">@@ -203,12 +203,6 @@
</span><span class="cx"> BOOL _needsViewFrameInWindowCoordinates;
</span><span class="cx"> BOOL _didScheduleWindowAndViewFrameUpdate;
</span><span class="cx">
</span><del>- // Whether the containing window of the WKView has a valid backing store.
- // The window server invalidates the backing store whenever the window is resized or minimized.
- // We use this flag to determine when we need to paint the background (white or clear)
- // when the web process is unresponsive or takes too long to paint.
- BOOL _windowHasValidBackingStore;
-
</del><span class="cx"> RetainPtr<NSColorSpace> _colorSpace;
</span><span class="cx">
</span><span class="cx"> RefPtr<WebCore::Image> _promisedImage;
</span><span class="lines">@@ -404,9 +398,6 @@
</span><span class="cx">
</span><span class="cx"> - (void)setFrameSize:(NSSize)size
</span><span class="cx"> {
</span><del>- if (!NSEqualSizes(size, [self frame].size))
- _data->_windowHasValidBackingStore = NO;
-
</del><span class="cx"> [super setFrameSize:size];
</span><span class="cx">
</span><span class="cx"> if (![self frameSizeUpdatesDisabled]) {
</span><span class="lines">@@ -1817,10 +1808,6 @@
</span><span class="cx"> return NSMouseInRect(localPoint, visibleThumbRect, [self isFlipped]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// FIXME: Use AppKit constants for these when they are available.
-static NSString * const windowDidChangeBackingPropertiesNotification = @"NSWindowDidChangeBackingPropertiesNotification";
-static NSString * const backingPropertyOldScaleFactorKey = @"NSBackingPropertyOldScaleFactorKey";
-
</del><span class="cx"> - (void)addWindowObserversForWindow:(NSWindow *)window
</span><span class="cx"> {
</span><span class="cx"> if (window) {
</span><span class="lines">@@ -1841,7 +1828,7 @@
</span><span class="cx"> [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowDidOrderOnScreen:)
</span><span class="cx"> name:@"_NSWindowDidBecomeVisible" object:window];
</span><span class="cx"> [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowDidChangeBackingProperties:)
</span><del>- name:windowDidChangeBackingPropertiesNotification object:window];
</del><ins>+ name:NSWindowDidChangeBackingPropertiesNotification object:window];
</ins><span class="cx"> [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowDidChangeScreen:)
</span><span class="cx"> name:NSWindowDidChangeScreenNotification object:window];
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</span><span class="lines">@@ -1866,7 +1853,7 @@
</span><span class="cx"> [[NSNotificationCenter defaultCenter] removeObserver:self name:@"NSWindowWillOrderOffScreenNotification" object:window];
</span><span class="cx"> [[NSNotificationCenter defaultCenter] removeObserver:self name:@"NSWindowDidOrderOffScreenNotification" object:window];
</span><span class="cx"> [[NSNotificationCenter defaultCenter] removeObserver:self name:@"_NSWindowDidBecomeVisible" object:window];
</span><del>- [[NSNotificationCenter defaultCenter] removeObserver:self name:windowDidChangeBackingPropertiesNotification object:window];
</del><ins>+ [[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowDidChangeBackingPropertiesNotification object:window];
</ins><span class="cx"> [[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowDidChangeScreenNotification object:window];
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</span><span class="cx"> [[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowDidChangeOcclusionStateNotification object:window];
</span><span class="lines">@@ -1888,7 +1875,6 @@
</span><span class="cx"> - (void)viewDidMoveToWindow
</span><span class="cx"> {
</span><span class="cx"> if ([self window]) {
</span><del>- _data->_windowHasValidBackingStore = NO;
</del><span class="cx"> [self doWindowDidChangeScreen];
</span><span class="cx">
</span><span class="cx"> ViewState::Flags viewStateChanges = ViewState::WindowIsActive | ViewState::IsVisible;
</span><span class="lines">@@ -1955,7 +1941,6 @@
</span><span class="cx">
</span><span class="cx"> - (void)_windowDidMiniaturize:(NSNotification *)notification
</span><span class="cx"> {
</span><del>- _data->_windowHasValidBackingStore = NO;
</del><span class="cx"> _data->_page->viewStateDidChange(ViewState::IsVisible);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1971,8 +1956,6 @@
</span><span class="cx">
</span><span class="cx"> - (void)_windowDidResize:(NSNotification *)notification
</span><span class="cx"> {
</span><del>- _data->_windowHasValidBackingStore = NO;
-
</del><span class="cx"> [self _updateWindowAndViewFrames];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1988,12 +1971,11 @@
</span><span class="cx">
</span><span class="cx"> - (void)_windowDidChangeBackingProperties:(NSNotification *)notification
</span><span class="cx"> {
</span><del>- CGFloat oldBackingScaleFactor = [[notification.userInfo objectForKey:backingPropertyOldScaleFactorKey] doubleValue];
- CGFloat newBackingScaleFactor = [self _intrinsicDeviceScaleFactor];
</del><ins>+ CGFloat oldBackingScaleFactor = [notification.userInfo[NSBackingPropertyOldScaleFactorKey] doubleValue];
+ CGFloat newBackingScaleFactor = [self _intrinsicDeviceScaleFactor];
</ins><span class="cx"> if (oldBackingScaleFactor == newBackingScaleFactor)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- _data->_windowHasValidBackingStore = NO;
</del><span class="cx"> _data->_page->setIntrinsicDeviceScaleFactor(newBackingScaleFactor);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>