Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(987)

Unified Diff: ppapi/native_client/src/shared/ppapi_proxy/ppp_instance_combined.cc

Issue 9087006: Switch a number of code and header files from DOS to Unix line-endings. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ppapi/native_client/src/shared/ppapi_proxy/ppp_instance_combined.cc
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/ppp_instance_combined.cc b/ppapi/native_client/src/shared/ppapi_proxy/ppp_instance_combined.cc
index 9da29505484d243ada8754f2c59ab0c3bc2939a1..b3af5904e0b3cf29cedf77fbc317e9e465eb8d41 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/ppp_instance_combined.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/ppp_instance_combined.cc
@@ -1,63 +1,63 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ppapi/native_client/src/shared/ppapi_proxy/ppp_instance_combined.h"
-
-#include <stdlib.h>
-
-namespace ppapi_proxy {
-
-PPP_Instance_Combined::PPP_Instance_Combined()
- : initialized_(false),
- did_change_view_1_0_(NULL) {
-}
-
-void PPP_Instance_Combined::Init1_0(const PPP_Instance_1_0* instance_if) {
- initialized_ = true;
- did_change_view_1_0_ = instance_if->DidChangeView;
- instance_1_1_.DidCreate = instance_if->DidCreate;
- instance_1_1_.DidDestroy = instance_if->DidDestroy;
- instance_1_1_.DidChangeView = NULL;
- instance_1_1_.DidChangeFocus = instance_if->DidChangeFocus;
- instance_1_1_.HandleDocumentLoad = instance_if->HandleDocumentLoad;
-}
-
-void PPP_Instance_Combined::Init1_1(const PPP_Instance_1_1* instance_if) {
- initialized_ = true;
- instance_1_1_ = *instance_if;
-}
-
-PP_Bool PPP_Instance_Combined::DidCreate(PP_Instance instance,
- uint32_t argc,
- const char* argn[],
- const char* argv[]) {
- return instance_1_1_.DidCreate(instance, argc, argn, argv);
-}
-
-void PPP_Instance_Combined::DidDestroy(PP_Instance instance) {
- return instance_1_1_.DidDestroy(instance);
-}
-
-void PPP_Instance_Combined::DidChangeView(PP_Instance instance,
- PP_Resource view_resource,
- const struct PP_Rect* position,
- const struct PP_Rect* clip) {
- if (instance_1_1_.DidChangeView)
- instance_1_1_.DidChangeView(instance, view_resource);
- else
- did_change_view_1_0_(instance, position, clip);
-}
-
-void PPP_Instance_Combined::DidChangeFocus(PP_Instance instance,
- PP_Bool has_focus) {
- instance_1_1_.DidChangeFocus(instance, has_focus);
-}
-
-PP_Bool PPP_Instance_Combined::HandleDocumentLoad(PP_Instance instance,
- PP_Resource url_loader) {
- return instance_1_1_.HandleDocumentLoad(instance, url_loader);
-}
-
-} // namespace ppapi_proxy
-
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ppapi/native_client/src/shared/ppapi_proxy/ppp_instance_combined.h"
+
+#include <stdlib.h>
+
+namespace ppapi_proxy {
+
+PPP_Instance_Combined::PPP_Instance_Combined()
+ : initialized_(false),
+ did_change_view_1_0_(NULL) {
+}
+
+void PPP_Instance_Combined::Init1_0(const PPP_Instance_1_0* instance_if) {
+ initialized_ = true;
+ did_change_view_1_0_ = instance_if->DidChangeView;
+ instance_1_1_.DidCreate = instance_if->DidCreate;
+ instance_1_1_.DidDestroy = instance_if->DidDestroy;
+ instance_1_1_.DidChangeView = NULL;
+ instance_1_1_.DidChangeFocus = instance_if->DidChangeFocus;
+ instance_1_1_.HandleDocumentLoad = instance_if->HandleDocumentLoad;
+}
+
+void PPP_Instance_Combined::Init1_1(const PPP_Instance_1_1* instance_if) {
+ initialized_ = true;
+ instance_1_1_ = *instance_if;
+}
+
+PP_Bool PPP_Instance_Combined::DidCreate(PP_Instance instance,
+ uint32_t argc,
+ const char* argn[],
+ const char* argv[]) {
+ return instance_1_1_.DidCreate(instance, argc, argn, argv);
+}
+
+void PPP_Instance_Combined::DidDestroy(PP_Instance instance) {
+ return instance_1_1_.DidDestroy(instance);
+}
+
+void PPP_Instance_Combined::DidChangeView(PP_Instance instance,
+ PP_Resource view_resource,
+ const struct PP_Rect* position,
+ const struct PP_Rect* clip) {
+ if (instance_1_1_.DidChangeView)
+ instance_1_1_.DidChangeView(instance, view_resource);
+ else
+ did_change_view_1_0_(instance, position, clip);
+}
+
+void PPP_Instance_Combined::DidChangeFocus(PP_Instance instance,
+ PP_Bool has_focus) {
+ instance_1_1_.DidChangeFocus(instance, has_focus);
+}
+
+PP_Bool PPP_Instance_Combined::HandleDocumentLoad(PP_Instance instance,
+ PP_Resource url_loader) {
+ return instance_1_1_.HandleDocumentLoad(instance, url_loader);
+}
+
+} // namespace ppapi_proxy
+

Powered by Google App Engine
This is Rietveld 408576698