Title: [166116] trunk/Source/WebKit/mac
- Revision
- 166116
- Author
- simon.fra...@apple.com
- Date
- 2014-03-22 10:51:00 -0700 (Sat, 22 Mar 2014)
Log Message
Remove duplicate line added during merging
https://bugs.webkit.org/show_bug.cgi?id=130623
Reviewed by Beth Dakin.
Remove a duplicate call to -_viewWillDrawInternal which
was added during merges.
* WebView/WebView.mm:
(LayerFlushController::flushLayers):
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (166115 => 166116)
--- trunk/Source/WebKit/mac/ChangeLog 2014-03-22 16:50:57 UTC (rev 166115)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-03-22 17:51:00 UTC (rev 166116)
@@ -1,3 +1,16 @@
+2014-03-21 Simon Fraser <simon.fra...@apple.com>
+
+ Remove duplicate line added during merging
+ https://bugs.webkit.org/show_bug.cgi?id=130623
+
+ Reviewed by Beth Dakin.
+
+ Remove a duplicate call to -_viewWillDrawInternal which
+ was added during merges.
+
+ * WebView/WebView.mm:
+ (LayerFlushController::flushLayers):
+
2014-03-21 Darin Adler <da...@apple.com>
Improve idiom used for string building in a few places
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (166115 => 166116)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-03-22 16:50:57 UTC (rev 166115)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-03-22 17:51:00 UTC (rev 166116)
@@ -8401,8 +8401,6 @@
[m_webView _viewWillDrawInternal];
- [m_webView _viewWillDrawInternal];
-
if ([m_webView _flushCompositingChanges]) {
#if !PLATFORM(IOS)
// AppKit may have disabled screen updates, thinking an upcoming window flush will re-enable them.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
