Skip to content
This repository has been archived by the owner on Apr 3, 2020. It is now read-only.

[Android] Fix build errors that are introduced by rebasing to version 31 #824

Merged
merged 1 commit into from
Oct 8, 2013

Conversation

sqliu
Copy link
Contributor

@sqliu sqliu commented Oct 8, 2013

Some changes that have been made in upstream version 31 break XWalk for Android.
Fix the break in XWalk, including:

  • Replacing AndroidBrowserProcess to BrowserStartupController.
  • Changes in DevToolsServer/JavaScriptDialogManager.
  • Some namespace changes.
  • Removing override method ContentVideoViewClient.keepScreenOn as interface has changed.
  • Removing kEnableExperimentalWebGL switch since this switch is no loger used from
    version 31 for Android port.

BUG=
TEST=Build

@sqliu
Copy link
Contributor Author

sqliu commented Oct 8, 2013

@yongsheng @wang16 PTAL, thanks

@sqliu
Copy link
Contributor Author

sqliu commented Oct 8, 2013

@sqliu
Copy link
Contributor Author

sqliu commented Oct 8, 2013

@kenchris updated the commit log to explain why some code/methed are removed.

@kenchris
Copy link
Contributor

kenchris commented Oct 8, 2013

ok lgtm

@yongsheng
Copy link
Contributor

commit log typo:
no loger -> no longer.
lgtm for others.
let's wait for trybot results.

… 31.

Some changes that have been made in upstream version 31 break XWalk for Android.
Fix the break in XWalk, including:
* Replacing AndroidBrowserProcess to BrowserStartupController.
* Changes in DevToolsServer/JavaScriptDialogManager.
* Some namespace changes.
* Removing override method ContentVideoViewClient.keepScreenOn as interface has changed.
* Removing kEnableExperimentalWebGL switch since this switch is no longer used from
  version 31 for Android port.

BUG=
TEST=Build
@Trybot
Copy link

Trybot commented Oct 8, 2013

Trybot Dashboard


Building status:

Finished the build of the PATCH in this pull request

Rebuild the failed bots you want!

Tue Oct 08 2013 19:25:09 GMT+0800 (CST) [xwalk_linux] Failed LOGS: build exception [runhooks]
Tue Oct 08 2013 20:49:09 GMT+0800 (CST) [xwalk_win] Failed LOGS: build failed [check coding style;compile]
Tue Oct 08 2013 20:50:39 GMT+0800 (CST) [xwalk_aura] Failed LOGS: build failed [check coding style;compile]
Tue Oct 08 2013 22:47:40 GMT+0800 (CST) [xwalk_android] Failed LOGS: build failed [Runtime_Core_test]


Select the bots:
  • xwalk_linux
  • xwalk_win
  • xwalk_aura
  • xwalk_android
Start the building:
  • < START >

@sqliu
Copy link
Contributor Author

sqliu commented Oct 8, 2013

@jeez
Copy link
Contributor

jeez commented Oct 8, 2013

Just to make sure I'm understanding it all! I can simply revert crosswalk-project/chromium-crosswalk@508c5aa now and then apply this patch to fix Android?

Will there be any other follow up patch for chromium-crosswalk after that?

@rakuco
Copy link
Contributor

rakuco commented Oct 8, 2013

According to http://src.chromium.org/viewvc/chrome?view=revision&revision=215135, the switch has been removed, but the feature has not just been turned on all the time: one must pass --ignore-gpu-blacklist to enable it unconditionally.

@jeez
Copy link
Contributor

jeez commented Oct 8, 2013

@rakuco I'm +1 to merge this and open an issue for the Android team to handle --ignore-gpu-blacklist later.

jeez added a commit that referenced this pull request Oct 8, 2013
[Android] Fix build errors that are introduced by rebasing to version 31
@jeez jeez merged commit aa4a75f into crosswalk-project:master Oct 8, 2013
@rakuco rakuco deleted the rebase-for-31 branch October 8, 2013 15:33
@yongsheng
Copy link
Contributor

@kenchris yes, it's enabled by default on a device only when if its graphic driver can meet the below requirements:
support GL extension 'GL_ARB_robustness' and its 'reset notifcation'.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants