Fix svn:eol-style property.

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1453@1473 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-10-18 16:59:40 +00:00
parent c384a19748
commit 7ab98f71da
29 changed files with 4230 additions and 4230 deletions

View File

@@ -1,8 +1,8 @@
Index: render_widget_host_view_mac.mm
===================================================================
--- render_widget_host_view_mac.mm (revision 202711)
+++ render_widget_host_view_mac.mm (working copy)
@@ -4,6 +4,7 @@
Index: render_widget_host_view_mac.mm
===================================================================
--- render_widget_host_view_mac.mm (revision 202711)
+++ render_widget_host_view_mac.mm (working copy)
@@ -4,6 +4,7 @@
#include "content/browser/renderer_host/render_widget_host_view_mac.h"
@@ -10,7 +10,7 @@ Index: render_widget_host_view_mac.mm
#include <QuartzCore/QuartzCore.h>
#include "base/bind.h"
@@ -125,6 +126,29 @@
@@ -125,6 +126,29 @@
return modifiers;
}
@@ -40,7 +40,7 @@ Index: render_widget_host_view_mac.mm
static float ScaleFactor(NSView* view) {
return ui::GetScaleFactorScale(ui::GetScaleFactorForNativeView(view));
}
@@ -1424,7 +1448,7 @@
@@ -1424,7 +1448,7 @@
// Forget IOSurface since we are drawing a software frame now.
if (compositing_iosurface_.get() &&
compositing_iosurface_->HasIOSurface()) {
@@ -49,7 +49,7 @@ Index: render_widget_host_view_mac.mm
}
}
}
@@ -2097,13 +2121,21 @@
@@ -2097,13 +2121,21 @@
NSNotificationCenter* notificationCenter =
[NSNotificationCenter defaultCenter];
@@ -75,7 +75,7 @@ Index: render_widget_host_view_mac.mm
name:NSWindowDidMoveNotification
object:oldWindow];
[notificationCenter
@@ -2112,13 +2144,15 @@
@@ -2112,13 +2144,15 @@
object:oldWindow];
}
if (newWindow) {