summaryrefslogtreecommitdiffstats
path: root/third_party/mojo_services
diff options
context:
space:
mode:
authorsorin <sorin@chromium.org>2015-04-10 16:53:21 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-10 23:54:00 +0000
commit4d64a8e24ee7083a13842f05388fb81d8441a373 (patch)
tree8bae1c3de9b3b34a00ce878cdd45d4861f42140d /third_party/mojo_services
parentf1d1609fce75c570455aaa526f6023ea97a80c0d (diff)
downloadchromium_src-4d64a8e24ee7083a13842f05388fb81d8441a373.zip
chromium_src-4d64a8e24ee7083a13842f05388fb81d8441a373.tar.gz
chromium_src-4d64a8e24ee7083a13842f05388fb81d8441a373.tar.bz2
Revert "Update mojo sdk to rev d459e688a608f6eda850a23bb5e308a76ea51a47"
This reverts commit c4010b0b30bb37e0a6916c3fb8eb97d44b024292. > Review URL: https://codereview.chromium.org/1051303002 > Cr-Commit-Position: refs/heads/master@{#324704} It breaks the compile on Win8 GN dbg. http://build.chromium.org/p/chromium.win/builders/Win8%20GN%20%28dbg%29/builds/4849 [870/2440] STAMP obj/cc/blink/cc_blink_unittests.inputdeps.stamp [871/2440] STAMP obj/ui/snapshot/snapshot_unittests.inputdeps.stamp [872/2440] ACTION //content/common:mojo_bindings__generator(//build/toolchain/win:32) [873/2440] ACTION //content/common:mojo_bindings__generator(//build/toolchain/win:32) [874/2440] ACTION //content/common:mojo_bindings__generator(//build/toolchain/win:32) [875/2440] ACTION //content/common:mojo_bindings__generator(//build/toolchain/win:32) [876/2440] ACTION //content/common:mojo_bindings__generator(//build/toolchain/win:32) [877/2440] ACTION //third_party/mojo_services/src/gpu/public/interfaces:interfaces__generator(//build/toolchain/win:32) [878/2440] ACTION //third_party/mojo_services/src/gpu/public/interfaces:interfaces__generator(//build/toolchain/win:32) FAILED: ninja -t msvc -e environment.x86 -- E:\b\build\goma/gomacc.exe "E:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86/cl.exe" /nologo /showIncludes /FC @obj/out/Debug/gen/third_party/mojo/src/mojo/public/interfaces/bindings/bindings.interface_control_messages.mojom.obj.rsp /c gen/third_party/mojo/src/mojo/public/interfaces/bindings/interface_control_messages.mojom.cc /Foobj/out/Debug/gen/third_party/mojo/src/mojo/public/interfaces/bindings/bindings.interface_control_messages.mojom.obj /Fdobj/third_party/mojo/src/mojo/public/interfaces/bindings/bindings_cc.pdb e:\b\build\slave\win8_gn__dbg_\build\src\third_party\mojo\src\mojo\public\cpp\bindings\lib\array_internal.h(426) : error C2039: 'ArrayHeader' : is not a member of 'mojo::internal::internal' e:\b\build\slave\win8_gn__dbg_\b TBR=rockot@chromium.org,jamesr@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=None Review URL: https://codereview.chromium.org/1081543002 Cr-Commit-Position: refs/heads/master@{#324713}
Diffstat (limited to 'third_party/mojo_services')
-rw-r--r--third_party/mojo_services/src/accessibility/public/interfaces/BUILD.gn2
-rw-r--r--third_party/mojo_services/src/clipboard/public/interfaces/BUILD.gn2
-rw-r--r--third_party/mojo_services/src/content_handler/public/interfaces/BUILD.gn2
-rw-r--r--third_party/mojo_services/src/geometry/public/interfaces/BUILD.gn2
-rw-r--r--third_party/mojo_services/src/gpu/public/interfaces/BUILD.gn2
-rw-r--r--third_party/mojo_services/src/http_server/public/interfaces/BUILD.gn2
-rw-r--r--third_party/mojo_services/src/input_events/public/interfaces/BUILD.gn2
-rw-r--r--third_party/mojo_services/src/input_events/public/interfaces/input_events.mojom2
-rw-r--r--third_party/mojo_services/src/native_viewport/public/interfaces/BUILD.gn2
-rw-r--r--third_party/mojo_services/src/navigation/public/interfaces/BUILD.gn2
-rw-r--r--third_party/mojo_services/src/surfaces/public/interfaces/BUILD.gn4
-rw-r--r--third_party/mojo_services/src/view_manager/public/interfaces/BUILD.gn2
-rw-r--r--third_party/mojo_services/src/window_manager/public/interfaces/BUILD.gn2
13 files changed, 0 insertions, 28 deletions
diff --git a/third_party/mojo_services/src/accessibility/public/interfaces/BUILD.gn b/third_party/mojo_services/src/accessibility/public/interfaces/BUILD.gn
index f2c1ba8..2b29c1a 100644
--- a/third_party/mojo_services/src/accessibility/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/accessibility/public/interfaces/BUILD.gn
@@ -15,6 +15,4 @@ mojom("interfaces") {
deps = [
"../../../geometry/public/interfaces",
]
-
- import_from = mojo_root
}
diff --git a/third_party/mojo_services/src/clipboard/public/interfaces/BUILD.gn b/third_party/mojo_services/src/clipboard/public/interfaces/BUILD.gn
index 4edbf63..16fe33b 100644
--- a/third_party/mojo_services/src/clipboard/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/clipboard/public/interfaces/BUILD.gn
@@ -9,6 +9,4 @@ mojom("interfaces") {
sources = [
"clipboard.mojom",
]
-
- import_from = mojo_root
}
diff --git a/third_party/mojo_services/src/content_handler/public/interfaces/BUILD.gn b/third_party/mojo_services/src/content_handler/public/interfaces/BUILD.gn
index ad1bb9a..c58507a 100644
--- a/third_party/mojo_services/src/content_handler/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/content_handler/public/interfaces/BUILD.gn
@@ -23,6 +23,4 @@ mojom("interfaces") {
]
mojo_sdk_deps = [ "mojo/public/interfaces/application" ]
-
- import_from = mojo_root
}
diff --git a/third_party/mojo_services/src/geometry/public/interfaces/BUILD.gn b/third_party/mojo_services/src/geometry/public/interfaces/BUILD.gn
index 217eb27..9047ee2 100644
--- a/third_party/mojo_services/src/geometry/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/geometry/public/interfaces/BUILD.gn
@@ -9,6 +9,4 @@ mojom("interfaces") {
sources = [
"geometry.mojom",
]
-
- import_from = mojo_root
}
diff --git a/third_party/mojo_services/src/gpu/public/interfaces/BUILD.gn b/third_party/mojo_services/src/gpu/public/interfaces/BUILD.gn
index b782146..ec061df 100644
--- a/third_party/mojo_services/src/gpu/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/gpu/public/interfaces/BUILD.gn
@@ -19,6 +19,4 @@ mojom("interfaces") {
deps = [
"../../../geometry/public/interfaces",
]
-
- import_from = mojo_root
}
diff --git a/third_party/mojo_services/src/http_server/public/interfaces/BUILD.gn b/third_party/mojo_services/src/http_server/public/interfaces/BUILD.gn
index a02039e..79aa6a6 100644
--- a/third_party/mojo_services/src/http_server/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/http_server/public/interfaces/BUILD.gn
@@ -24,6 +24,4 @@ mojom("interfaces") {
deps = [
"$mojo_network_service_root/network/public/interfaces",
]
-
- import_from = mojo_root
}
diff --git a/third_party/mojo_services/src/input_events/public/interfaces/BUILD.gn b/third_party/mojo_services/src/input_events/public/interfaces/BUILD.gn
index 5f0f22d..5ef09eb 100644
--- a/third_party/mojo_services/src/input_events/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/input_events/public/interfaces/BUILD.gn
@@ -17,6 +17,4 @@ mojom("interfaces") {
deps = [
"../../../geometry/public/interfaces",
]
-
- import_from = mojo_root
}
diff --git a/third_party/mojo_services/src/input_events/public/interfaces/input_events.mojom b/third_party/mojo_services/src/input_events/public/interfaces/input_events.mojom
index 9fa36303..0086265 100644
--- a/third_party/mojo_services/src/input_events/public/interfaces/input_events.mojom
+++ b/third_party/mojo_services/src/input_events/public/interfaces/input_events.mojom
@@ -70,8 +70,6 @@ struct Event {
EventType action;
// TODO(sky): parts of this should move to PointerData.
EventFlags flags;
- // Time the event was delivered. The time is in milliseconds and corresponds
- // to the uptime of the machine.
int64 time_stamp;
KeyData? key_data;
PointerData? pointer_data;
diff --git a/third_party/mojo_services/src/native_viewport/public/interfaces/BUILD.gn b/third_party/mojo_services/src/native_viewport/public/interfaces/BUILD.gn
index 5603e17..86ff870 100644
--- a/third_party/mojo_services/src/native_viewport/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/native_viewport/public/interfaces/BUILD.gn
@@ -18,6 +18,4 @@ mojom("interfaces") {
"../../../input_events/public/interfaces",
"../../../surfaces/public/interfaces:surface_id",
]
-
- import_from = mojo_root
}
diff --git a/third_party/mojo_services/src/navigation/public/interfaces/BUILD.gn b/third_party/mojo_services/src/navigation/public/interfaces/BUILD.gn
index 61158f3..19b9f8a 100644
--- a/third_party/mojo_services/src/navigation/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/navigation/public/interfaces/BUILD.gn
@@ -21,6 +21,4 @@ mojom("interfaces") {
deps = [
"$mojo_network_service_root/network/public/interfaces",
]
-
- import_from = mojo_root
}
diff --git a/third_party/mojo_services/src/surfaces/public/interfaces/BUILD.gn b/third_party/mojo_services/src/surfaces/public/interfaces/BUILD.gn
index 36c8707..7902a7a 100644
--- a/third_party/mojo_services/src/surfaces/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/surfaces/public/interfaces/BUILD.gn
@@ -20,14 +20,10 @@ mojom("interfaces") {
"../../../gpu/public/interfaces",
"../../../native_viewport/public/interfaces",
]
-
- import_from = mojo_root
}
mojom("surface_id") {
sources = [
"surface_id.mojom",
]
-
- import_from = mojo_root
}
diff --git a/third_party/mojo_services/src/view_manager/public/interfaces/BUILD.gn b/third_party/mojo_services/src/view_manager/public/interfaces/BUILD.gn
index eff5f62..177066b 100644
--- a/third_party/mojo_services/src/view_manager/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/view_manager/public/interfaces/BUILD.gn
@@ -22,6 +22,4 @@ mojom("interfaces") {
"../../../native_viewport/public/interfaces",
"../../../surfaces/public/interfaces:surface_id",
]
-
- import_from = mojo_root
}
diff --git a/third_party/mojo_services/src/window_manager/public/interfaces/BUILD.gn b/third_party/mojo_services/src/window_manager/public/interfaces/BUILD.gn
index 3cf56dad..b97f069 100644
--- a/third_party/mojo_services/src/window_manager/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/window_manager/public/interfaces/BUILD.gn
@@ -19,6 +19,4 @@ mojom("interfaces") {
"../../../geometry/public/interfaces",
"../../../input_events/public/interfaces",
]
-
- import_from = mojo_root
}