-
Notifications
You must be signed in to change notification settings - Fork 81
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
8 changed files
with
3,117 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- a/src/browser/BUILD.gn | ||
+++ b/src/browser/BUILD.gn | ||
@@ -40,7 +40,7 @@ | ||
if (is_mac) { | ||
target += "apple-darwin" | ||
} else if (is_linux) { | ||
- target += "unknown-linux-gnu" | ||
+ target += "linux-android" | ||
} | ||
|
||
libs = ["carbonyl"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
--- a/chromium/src/carbonyl/src/browser/renderer.cc | ||
+++ b/chromium/src/carbonyl/src/browser/renderer.cc | ||
@@ -1,5 +1,6 @@ | ||
#include "carbonyl/src/browser/renderer.h" | ||
|
||
+#include <vector> | ||
#include <memory> | ||
#include <iostream> | ||
#include <stdio.h> |
22 changes: 22 additions & 0 deletions
22
tur-continuous/carbonyl/0003-rename-gfx-namespace-to-gl.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
--- a/chromium/src/components/viz/service/display_embedder/software_output_device_proxy.h | ||
+++ b/chromium/src/components/viz/service/display_embedder/software_output_device_proxy.h | ||
@@ -64,7 +64,7 @@ | ||
SoftwareOutputDeviceProxy& operator=(const SoftwareOutputDeviceProxy&) = delete; | ||
|
||
// SoftwareOutputDevice implementation. | ||
- void OnSwapBuffers(SoftwareOutputDevice::SwapBuffersCallback swap_ack_callback, gfx::FrameData data) override; | ||
+ void OnSwapBuffers(SoftwareOutputDevice::SwapBuffersCallback swap_ack_callback, gl::FrameData data) override; | ||
|
||
// SoftwareOutputDeviceBase implementation. | ||
void ResizeDelegated() override; | ||
--- a/chromium/src/components/viz/service/display_embedder/software_output_device_proxy.cc | ||
+++ b/chromium/src/components/viz/service/display_embedder/software_output_device_proxy.cc | ||
@@ -73,7 +73,7 @@ | ||
|
||
void SoftwareOutputDeviceProxy::OnSwapBuffers( | ||
SoftwareOutputDevice::SwapBuffersCallback swap_ack_callback, | ||
- gfx::FrameData data) { | ||
+ gl::FrameData data) { | ||
DCHECK(swap_ack_callback_.is_null()); | ||
|
||
// We aren't waiting on DrawAck() and can immediately run the callback. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- a/chromium/src/content/renderer/render_frame_impl.cc | ||
+++ b/chromium/src/content/renderer/render_frame_impl.cc | ||
@@ -2223,7 +2223,7 @@ | ||
auto* view = static_cast<blink::WebViewImpl*>(GetWebFrame()->View()); | ||
std::vector<carbonyl::mojom::TextDataPtr> data; | ||
|
||
- view->MainFrameImpl()->GetFrame()->View()->GetPaintRecord().Playback( | ||
+ view->MainFrameImpl()->GetFrame()->View()->GetPaintRecord()->Playback( | ||
renderer->BeginPaint(width, height) | ||
); | ||
|
Oops, something went wrong.