1366555 - Remove MOZ_PHOTON_THEME ifdefs and non-MOZ_PHOTON_THEME code

Status: RESOLVED FIXED

(Firefox :: Theme, enhancement, P1)

Description

[Dão Gottwald [:dao]]

Early in the Nightly 57 cycle, we should remove all MOZ_PHOTON_THEME ifdefs and non-MOZ_PHOTON_THEME code. This will make code more approachable and allow us to better focus on the remaining photon work.

Nihanth mentioned he had written a script for doing this automatically.

Comment 1

[Mike Conley (:mconley) (:⚙️)]

While we're at it, we should also ensure that any Photon-specific tests are enabled to ride the trains.

Comment 2

[Dão Gottwald [:dao]]

We'll want to land bug 1363485 and bug 1349555 before doing this.

Comment 3

[Michael Kohler [:mkohler]]

I'm working on this bug. I wanted to test this, but |./mach build| gives me the following error. I'm not sure what I should do to exclude this file from the directives check. Dao, could you help me out here?

 1:01.97 application.ini
 1:02.45 Elapsed: 0.00s; From /Users/mkohler/development/mozilla-central/objdir-frontend/dist/bin/gmp-fake/1.0: Kept 2 existing; Added/updated 0; Removed 0 files and 0 directories.
 1:02.48 Elapsed: 0.02s; From /Users/mkohler/development/mozilla-central/objdir-frontend/dist/bin/gmp-fakeopenh264/1.0: Kept 2 existing; Added/updated 0; Removed 0 files and 0 directories.
 1:02.80 Elapsed: 0.05s; From /Users/mkohler/development/mozilla-central/objdir-frontend/dist/bin/gmp-clearkey/0.1: Kept 0 existing; Added/updated 1; Removed 0 files and 0 directories.
 1:02.87 Elapsed: 0.10s; From /Users/mkohler/development/mozilla-central/objdir-frontend/dist/bin/browser/features/[e-mail]: Kept 71 existing; Added/updated 1; Removed 0 files and 0 directories.
 1:02.89 Elapsed: 0.03s; From /Users/mkohler/development/mozilla-central/objdir-frontend/dist/bin/browser/features/[e-mail]: Kept 1 existing; Added/updated 1; Removed 0 files and 0 directories.
 1:03.21 Elapsed: 0.11s; From /Users/mkohler/development/mozilla-central/objdir-frontend/dist/bin/browser/features/[e-mail]: Kept 34 existing; Added/updated 2; Removed 0 files and 0 directories.
 1:03.22 Elapsed: 0.08s; From /Users/mkohler/development/mozilla-central/objdir-frontend/dist/bin/browser/features/[e-mail]: Kept 31 existing; Added/updated 1; Removed 0 files and 0 directories.
 1:03.26 Traceback (most recent call last):
 1:03.27   File "/usr/local/Cellar/python/2.7.13_1/Frameworks/Python.framework/Versions/2.7/lib/python2.7/runpy.py", line 174, in _run_module_as_main
 1:03.27     "__main__", fname, loader, pkg_name)
 1:03.27   File "/usr/local/Cellar/python/2.7.13_1/Frameworks/Python.framework/Versions/2.7/lib/python2.7/runpy.py", line 72, in _run_code
 1:03.27     exec code in run_globals
 1:03.27   File "/Users/mkohler/development/mozilla-central/python/mozbuild/mozbuild/action/process_install_manifest.py", line 120, in <module>
 1:03.27     main(sys.argv[1:])
 1:03.27   File "/Users/mkohler/development/mozilla-central/python/mozbuild/mozbuild/action/process_install_manifest.py", line 107, in main
 1:03.27     defines=args.defines)
 1:03.27   File "/Users/mkohler/development/mozilla-central/python/mozbuild/mozbuild/action/process_install_manifest.py", line 70, in process_manifest
 1:03.27     remove_empty_directories=remove_empty_directories)
 1:03.27   File "/Users/mkohler/development/mozilla-central/python/mozbuild/mozpack/copier.py", line 428, in copy
 1:03.27     copy_results.append((destfile, f.copy(destfile, skip_if_older)))
 1:03.27   File "/Users/mkohler/development/mozilla-central/python/mozbuild/mozpack/files.py", line 566, in copy
 1:03.28     pp.processFile(input=input, output=dest, depfile=deps_out)
 1:03.28   File "/Users/mkohler/development/mozilla-central/python/mozbuild/mozbuild/preprocessor.py", line 388, in processFile
 1:03.28     self.failUnused(input.name)
 1:03.28   File "/Users/mkohler/development/mozilla-central/python/mozbuild/mozbuild/preprocessor.py", line 332, in failUnused
 1:03.28     raise Preprocessor.Error(fake, msg, None)
 1:03.28 mozbuild.preprocessor.Error: (u'/Users/mkohler/development/mozilla-central/browser/extensions/pocket/skin/osx/pocket.css', None, 'no preprocessor directives found', None)
 1:03.30 make[5]: *** [install-dist/bin/browser/features/[e-mail]] Error 1
 1:03.30 make[5]: *** Waiting for unfinished jobs....
 1:03.51 Elapsed: 0.05s; From /Users/mkohler/development/mozilla-central/objdir-frontend/dist/bin/browser/features/[e-mail]: Kept 2 existing; Added/updated 1; Removed 0 files and 0 directories.
 1:03.58 Elapsed: 0.10s; From /Users/mkohler/development/mozilla-central/objdir-frontend/dist/bin/browser/features/[e-mail]: Kept 20 existing; Added/updated 1; Removed 0 files and 0 directories.
 1:05.55 Traceback (most recent call last):
 1:05.55   File "/usr/local/Cellar/python/2.7.13_1/Frameworks/Python.framework/Versions/2.7/lib/python2.7/runpy.py", line 174, in _run_module_as_main
 1:05.55     "__main__", fname, loader, pkg_name)
 1:05.56   File "/usr/local/Cellar/python/2.7.13_1/Frameworks/Python.framework/Versions/2.7/lib/python2.7/runpy.py", line 72, in _run_code
 1:05.56     exec code in run_globals
 1:05.56   File "/Users/mkohler/development/mozilla-central/python/mozbuild/mozbuild/action/process_install_manifest.py", line 120, in <module>
 1:05.56     main(sys.argv[1:])
 1:05.56   File "/Users/mkohler/development/mozilla-central/python/mozbuild/mozbuild/action/process_install_manifest.py", line 107, in main
 1:05.56     defines=args.defines)
 1:05.56   File "/Users/mkohler/development/mozilla-central/python/mozbuild/mozbuild/action/process_install_manifest.py", line 70, in process_manifest
 1:05.56     remove_empty_directories=remove_empty_directories)
 1:05.56   File "/Users/mkohler/development/mozilla-central/python/mozbuild/mozpack/copier.py", line 428, in copy
 1:05.56     copy_results.append((destfile, f.copy(destfile, skip_if_older)))
 1:05.56   File "/Users/mkohler/development/mozilla-central/python/mozbuild/mozpack/files.py", line 566, in copy
 1:05.56     pp.processFile(input=input, output=dest, depfile=deps_out)
 1:05.56   File "/Users/mkohler/development/mozilla-central/python/mozbuild/mozbuild/preprocessor.py", line 387, in processFile
 1:05.56     self.do_include(input, False)
 1:05.56   File "/Users/mkohler/development/mozilla-central/python/mozbuild/mozbuild/preprocessor.py", line 776, in do_include
 1:05.56     self.handleLine(l)
 1:05.56   File "/Users/mkohler/development/mozilla-central/python/mozbuild/mozbuild/preprocessor.py", line 550, in handleLine
 1:05.56     cmd(args)
 1:05.56   File "/Users/mkohler/development/mozilla-central/python/mozbuild/mozbuild/preprocessor.py", line 776, in do_include
 1:05.56     self.handleLine(l)
 1:05.56   File "/Users/mkohler/development/mozilla-central/python/mozbuild/mozbuild/preprocessor.py", line 550, in handleLine
 1:05.56     cmd(args)
 1:05.56   File "/Users/mkohler/development/mozilla-central/python/mozbuild/mozbuild/preprocessor.py", line 665, in do_endif
 1:05.56     self.ifStates.pop()
 1:05.57 IndexError: pop from empty list
 1:05.58 make[5]: *** [install-dist/bin/browser] Error 1
 1:05.58 make[4]: *** [faster] Error 2
 1:05.58 make[3]: *** [pre-export] Error 2
 1:05.59 make[2]: *** [default] Error 2
 1:05.59 make[1]: *** [realbuild] Error 2
 1:05.59 make: *** [build] Error 2
 1:05.66 0 compiler warnings present.

Comment 4

[Dão Gottwald [:dao]]

(In reply to Michael Kohler [:mkohler] from comment #3)
>  1:03.28 mozbuild.preprocessor.Error:
> (u'/Users/mkohler/development/mozilla-central/browser/extensions/pocket/skin/
> osx/pocket.css', None, 'no preprocessor directives found', None)

For files that don't need to be preprocessed because they don't have any ifdefs anymore, you need to update their jar.mn entry (remove the * marker):
http://searchfox.org/mozilla-central/rev/30a47c4339bd397b937abdb2305f99d3bb537ba6/browser/extensions/pocket/jar.mn#18

Comment 5

[Michael Kohler [:mkohler]]

Attachment: Bug 1366555 - Remove MOZ_PHOTON_THEME ifdefs and non-MOZ_PHOTON_THEME code

Review commit: https://reviewboard.mozilla.org/r/164688/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/164688/

Comment 6

[Michael Kohler [:mkohler]]

Dao, could you please push this to try for me? I somehow screwed up my local repository and it doesn't want to push to try anymore. (and my email address doesn't match my LDAP account, so I can't click on the automation parts of MozReview)

Comment 7

[Dão Gottwald [:dao]]

Try is currently broken: bug 1387407

Comment 8

[Dão Gottwald [:dao]]

Comment on attachment 8893855 [details]
Bug 1366555 - Remove MOZ_PHOTON_THEME ifdefs and non-MOZ_PHOTON_THEME code

https://reviewboard.mozilla.org/r/164688/#review170330

::: browser/base/content/browser-places.js:1908
(Diff revision 1)
>  
>    onStarCommand(aEvent) {
>      // Ignore clicks on the star if we are updating its state.
>      if (!this._pendingUpdate) {
>        let isBookmarked = this._itemGuids.size > 0;
> -      // Disable the old animation in photon
> +      // Set up variables for new animation

I think you can just remove this comment

::: browser/base/content/tabbrowser.xml:6152
(Diff revision 1)
>        </method>
>  
>        <property name="_isCustomizing" readonly="true">
>          <getter><![CDATA[
>            let root = document.documentElement;
> -          return root.getAttribute("customizing") == "true" ||
> +          return root.getAttribute("customizing") == "true";

Could get rid of the root variable now and use document.documentElement directly...

::: browser/base/content/test/general/browser_bookmark_popup.js:12
(Diff revision 1)
>  /**
>   * Test opening and closing the bookmarks panel.
>   */
>  
>  let bookmarkPanel = document.getElementById("editBookmarkPanel");
> -let bookmarkStar = AppConstants.MOZ_PHOTON_THEME ? BookmarkingUI.star : BookmarkingUI.button;
> +let bookmarkStar = BookmarkingUI.button;

This should be BookmarkingUI.star, right?

::: browser/base/content/test/performance/browser_startup_images.js
(Diff revision 1)
>    await startupRecorder.done;
>  
>    let data = startupRecorder.data.images;
>    let filteredWhitelist = whitelist.filter(el => {
> -    return el.platforms.includes(AppConstants.platform) &&
> +    return el.platforms.includes(AppConstants.platform);
> -           (el.photon === undefined || el.photon == AppConstants.MOZ_PHOTON_THEME);

Please remove non-photon entries and the "photon" flags from the whitelist.

::: browser/components/customizableui/CustomizeMode.jsm:651
(Diff revision 1)
>          docEl.setAttribute("customize-entered", true);
>        } else {
>          docEl.removeAttribute("customizing");
>          docEl.removeAttribute("customize-entered");
>        }
>        return Promise.resolve();

nit: reduce indent

::: browser/components/customizableui/test/browser_984455_bookmarks_items_reparenting.js:76
(Diff revision 1)
>      };
>  
>      // Open the bookmarks menu button context menus and ensure that
>      // they have the proper views attached.
>      let shownPromise = bookmarksMenuPanelShown();
> -    if (!AppConstants.MOZ_PHOTON_THEME) {
> +    

nit: remove spaces

::: browser/themes/linux/browser.css
(Diff revision 1)
>    --toolbar-non-lwt-bgcolor: -moz-dialog;
>    --toolbar-non-lwt-textcolor: -moz-dialogtext;
>    --toolbar-non-lwt-bgimage: linear-gradient(rgba(255,255,255,.15), rgba(255,255,255,.15));
>    --toolbar-bgcolor: var(--toolbar-non-lwt-bgcolor);
>    --toolbar-bgimage: var(--toolbar-non-lwt-bgimage);
> -

nit: keep this blank line

::: browser/themes/linux/browser.css
(Diff revision 1)
> -
> -  --toolbarbutton-checkedhover-backgroundcolor: rgba(200,200,200,.5);
> -%endif
> -
>    --toolbarbutton-vertical-text-padding: calc(var(--toolbarbutton-inner-padding) - 1px);
> -

ditto

::: browser/themes/shared/browser.inc:7
(Diff revision 1)
>  % Note that zoom-reset-button is a bit different since it doesn't use an image and thus has the image with display: none.
>  %define nestedButtons #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button
>  %define primaryToolbarButtons #back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, @nestedButtons@, #e10s-button, #panic-button, #webide-button, #containers-panelmenu
>  
> -%ifdef MOZ_PHOTON_THEME
>  %define primaryToolbarButtons @primaryToolbarButtons@, #reload-button, #stop-button, #library-button

I think primaryToolbarButtons is unused now, let's remove it!

::: browser/themes/shared/browser.inc:17
(Diff revision 1)
>  %endif
>  
>  %define inAnyPanel :-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])
>  
> -%ifdef MOZ_PHOTON_THEME
>  %define attributeSelectorForToolbar

We can now remove attributeSelectorForToolbar too since it's always empty.

::: browser/themes/shared/customizableui/panelUI.inc.css:1733
(Diff revision 1)
>    background-clip: padding-box;
>    background-position: center;
>    background-repeat: no-repeat;
>    background-size: 1px 18px;
>    box-shadow: 0 0 0 1px hsla(0,0%,100%,.2);
>  }

Did you forget to remove this rule?

::: browser/themes/shared/toolbarbutton-icons.inc.css:277
(Diff revision 1)
>  
>  #PanelUI-menu-button {
>    list-style-image: url("chrome://browser/skin/menu.svg");
>  }
>  
> -%ifdef MOZ_PHOTON_THEME
> +#edit-controls > #cut-button {

"#edit-controls >" shouldn't be needed anymore

Comment 9

[Michael Kohler [:mkohler]]

Comment on attachment 8893855 [details]
Bug 1366555 - Remove MOZ_PHOTON_THEME ifdefs and non-MOZ_PHOTON_THEME code

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/164688/diff/1-2/

Comment 10

[Michael Kohler [:mkohler]]

Try run: https://treeherder.mozilla.org/#/jobs?repo=try&revision=c61e0a0c516fcf6b659fe0dafa1dff5d078ef6a0

Also, I've updated to the latest tip, so the comparison between rev 1 and 2 in the MozReview might not be the best.. Sorry about that ;)

Comment 11

[Dão Gottwald [:dao]]

Comment on attachment 8893855 [details]
Bug 1366555 - Remove MOZ_PHOTON_THEME ifdefs and non-MOZ_PHOTON_THEME code

https://reviewboard.mozilla.org/r/164688/#review170554

Thanks!

Comment 12

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/1538b0445eda
Remove MOZ_PHOTON_THEME ifdefs and non-MOZ_PHOTON_THEME code r=dao

Comment 13

[Pulsebot]

Backout by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/d9bef5f3594d
Backed out changeset 1538b0445eda for timing browser_locationBarCommand.js and browser_locationBarExternalLoad.js. r=backout

Comment 14

[Sebastian Hengst [:aryx] (needinfo me if it's about an intermittent or backout)]

Backed out for timing browser_locationBarCommand.js and browser_locationBarExternalLoad.js and Marionette:

https://hg.mozilla.org/integration/autoland/rev/d9bef5f3594da3d5fc2f9552cd10cfa8ac305e02

Push with failures: https://treeherder.mozilla.org/#/jobs?repo=autoland&revision=1538b0445eda6183f182009c7a25b7724547fee6&filter-resultStatus=testfailed&filter-resultStatus=busted&filter-resultStatus=exception&filter-resultStatus=retry&filter-resultStatus=runnable

Failure log browser-chrome: https://treeherder.mozilla.org/logviewer.html#?job_id=121223109&repo=autoland

[task 2017-08-05T20:44:46.554191Z] 20:44:46     INFO - TEST-START | browser/base/content/test/urlbar/browser_locationBarCommand.js
[task 2017-08-05T20:45:31.578005Z] 20:45:31     INFO - TEST-INFO | started process screentopng
[task 2017-08-05T20:45:33.270399Z] 20:45:33     INFO - TEST-INFO | screentopng: exit 0
[task 2017-08-05T20:45:33.272369Z] 20:45:33     INFO - Buffered messages logged at 20:44:46
[task 2017-08-05T20:45:33.274077Z] 20:45:33     INFO - Entering test bound setup
[task 2017-08-05T20:45:33.275958Z] 20:45:33     INFO - Leaving test bound setup
[task 2017-08-05T20:45:33.277714Z] 20:45:33     INFO - Entering test bound alt_left_click_test
[task 2017-08-05T20:45:33.279940Z] 20:45:33     INFO - Running test: Alt left click
[task 2017-08-05T20:45:33.282642Z] 20:45:33     INFO - TEST-PASS | browser/base/content/test/urlbar/browser_locationBarCommand.js | page proxy state must be invalid for go button to be visible - 
[task 2017-08-05T20:45:33.287098Z] 20:45:33     INFO - Buffered messages finished
[task 2017-08-05T20:45:33.290082Z] 20:45:33     INFO - TEST-UNEXPECTED-FAIL | browser/base/content/test/urlbar/browser_locationBarCommand.js | Test timed out - 
[task 2017-08-05T20:45:33.294353Z] 20:45:33     INFO - GECKO(1756) | MEMORY STAT | vsize 935MB | residentFast 222MB | heapAllocated 88MB
[task 2017-08-05T20:45:33.300521Z] 20:45:33     INFO - TEST-OK | browser/base/content/test/urlbar/browser_locationBarCommand.js | took 45054ms
[task 2017-08-05T20:45:33.306257Z] 20:45:33     INFO - checking window state
[task 2017-08-05T20:45:33.308409Z] 20:45:33     INFO - TEST-START | browser/base/content/test/urlbar/browser_locationBarExternalLoad.js
[task 2017-08-05T20:46:17.080659Z] 20:46:17     INFO - Not taking screenshot here: see the one that was previously logged
[task 2017-08-05T20:46:17.088937Z] 20:46:17     INFO - Buffered messages logged at 20:45:31
[task 2017-08-05T20:46:17.092210Z] 20:46:17     INFO - Entering test bound 
[task 2017-08-05T20:46:17.099584Z] 20:46:17     INFO - Buffered messages logged at 20:45:32
[task 2017-08-05T20:46:17.102448Z] 20:46:17     INFO - Console message: [JavaScript Error: "The character encoding of the HTML document was not declared. The document will render with garbled text in some browser configurations if the document contains characters from outside the US-ASCII range. The character encoding of the page must be declared in the document or in the transfer protocol." {file: "data:text/html,<body>hi" line: 0}]
[task 2017-08-05T20:46:17.109842Z] 20:46:17     INFO - TEST-PASS | browser/base/content/test/urlbar/browser_locationBarExternalLoad.js | focusedElement not null - null == null - 
[task 2017-08-05T20:46:17.112909Z] 20:46:17     INFO - TEST-PASS | browser/base/content/test/urlbar/browser_locationBarExternalLoad.js | activeWindow not correct - [object Window] == [object Window] - 
[task 2017-08-05T20:46:17.114676Z] 20:46:17     INFO - TEST-PASS | browser/base/content/test/urlbar/browser_locationBarExternalLoad.js | content window should be focused - 
[task 2017-08-05T20:46:17.118927Z] 20:46:17     INFO - TEST-PASS | browser/base/content/test/urlbar/browser_locationBarExternalLoad.js | load of data:text/html,<body>hi by urlEnter should produce a page with a different principal - 
[task 2017-08-05T20:46:17.122619Z] 20:46:17     INFO - Buffered messages finished
[task 2017-08-05T20:46:17.127570Z] 20:46:17     INFO - TEST-UNEXPECTED-FAIL | browser/base/content/test/urlbar/browser_locationBarExternalLoad.js | Test timed out - 

Failure log Marionette: https://treeherder.mozilla.org/logviewer.html#?job_id=121224162&repo=autoland
[task 2017-08-05T21:12:52.354215Z] 21:12:52     INFO - TEST-UNEXPECTED-ERROR | test_mouse_action.py TestMouseAction.test_chrome_click | TimeoutException: wait_for_condition timed out
[task 2017-08-05T21:12:52.354276Z] 21:12:52     INFO - Traceback (most recent call last):
[task 2017-08-05T21:12:52.354359Z] 21:12:52     INFO -   File "/home/worker/workspace/build/venv/local/lib/python2.7/site-packages/marionette_harness/marionette_test/testcases.py", line 156, in run
[task 2017-08-05T21:12:52.356028Z] 21:12:52     INFO -     testMethod()
[task 2017-08-05T21:12:52.356841Z] 21:12:52     INFO -   File "/home/worker/workspace/build/tests/marionette/tests/testing/marionette/harness/marionette_harness/tests/unit/test_mouse_action.py", line 83, in test_chrome_click
[task 2017-08-05T21:12:52.357289Z] 21:12:52     INFO -     self.wait_for_condition(lambda mn: mn.get_url() == data_uri)
[task 2017-08-05T21:12:52.358016Z] 21:12:52     INFO -   File "/home/worker/workspace/build/venv/local/lib/python2.7/site-packages/marionette_harness/marionette_test/testcases.py", line 345, in wait_for_condition
[task 2017-08-05T21:12:52.358914Z] 21:12:52     INFO -     raise TimeoutException("wait_for_condition timed out")

Comment 15

[Dão Gottwald [:dao]]

Comment on attachment 8893855 [details]
Bug 1366555 - Remove MOZ_PHOTON_THEME ifdefs and non-MOZ_PHOTON_THEME code

https://reviewboard.mozilla.org/r/164688/#review170558

::: browser/themes/shared/browser.inc.css
(Diff revision 2)
>  :root[tabsintitlebar][sizemode=normal] #TabsToolbar
>  %endif
>  {
>    padding-inline-start: 40px;
>  }
> -%endif

You need to add back this endif. There was one endif missing before here.

Comment 16

[Michael Kohler [:mkohler]]

Try run: https://treeherder.mozilla.org/#/jobs?repo=try&revision=1f025e3d827cb2a40ccde16e2e050cf9770310f8

Comment 17

[Michael Kohler [:mkohler]]

Comment on attachment 8893855 [details]
Bug 1366555 - Remove MOZ_PHOTON_THEME ifdefs and non-MOZ_PHOTON_THEME code

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/164688/diff/2-3/

Comment 18

[Dão Gottwald [:dao]]

Comment on attachment 8893855 [details]
Bug 1366555 - Remove MOZ_PHOTON_THEME ifdefs and non-MOZ_PHOTON_THEME code

https://reviewboard.mozilla.org/r/164688/#review170714

Comment 19

[Mozilla Autoland]

We're sorry, Autoland could not rebase your commits for you automatically. Please manually rebase your commits and try again.

hg error in cmd: hg rebase -s 323ed7341101 -d 89ed2b795d66: rebasing 411869:323ed7341101 "Bug 1366555 - Remove MOZ_PHOTON_THEME ifdefs and non-MOZ_PHOTON_THEME code r=dao" (tip)
merging browser/app/profile/firefox.js
merging browser/base/content/browser-pageActions.js
merging browser/base/content/browser-places.js
merging browser/base/content/browser-tabsintitlebar.js
merging browser/base/content/browser.css
merging browser/base/content/browser.xul
merging browser/base/content/tabbrowser.xml
merging browser/base/content/test/general/browser_bookmark_popup.js
merging browser/base/content/test/performance/browser_startup_images.js
merging browser/base/content/test/static/browser_all_files_referenced.js
merging browser/base/content/theme-vars.inc.css
merging browser/base/content/urlbarBindings.xml
merging browser/components/customizableui/CustomizeMode.jsm
merging browser/components/customizableui/content/customizeMode.inc.xul
merging browser/components/customizableui/content/panelUI.inc.xul
merging browser/components/customizableui/test/browser_984455_bookmarks_items_reparenting.js
merging browser/components/customizableui/test/browser_customizemode_uidensity.js
merging browser/components/extensions/test/browser/browser_ext_themes_icons.js
merging browser/components/places/tests/browser/browser_toolbarbutton_menu_context.js
merging browser/extensions/pocket/bootstrap.js
merging browser/extensions/pocket/jar.mn
merging browser/extensions/pocket/skin/linux/pocket.css
merging browser/extensions/pocket/skin/osx/pocket.css
merging browser/extensions/pocket/skin/windows/pocket.css
merging browser/modules/PageActions.jsm
merging browser/themes/linux/browser.css
merging browser/themes/linux/jar.mn
merging browser/themes/osx/browser.css
merging browser/themes/osx/jar.mn
merging browser/themes/shared/browser.inc
merging browser/themes/shared/browser.inc.css
merging browser/themes/shared/compacttheme.inc.css
merging browser/themes/shared/controlcenter/panel.inc.css
merging browser/themes/shared/customizableui/customizeMode.inc.css
merging browser/themes/shared/customizableui/panelUI.inc.css
merging browser/themes/shared/downloads/indicator.inc.css
merging browser/themes/shared/identity-block/identity-block.inc.css
merging browser/themes/shared/jar.inc.mn
merging browser/themes/shared/menupanel.inc.css
merging browser/themes/shared/tabs.inc.css
merging browser/themes/shared/toolbarbutton-icons.inc.css
merging browser/themes/shared/toolbarbuttons.inc.css
merging browser/themes/shared/urlbar-searchbar.inc.css
merging browser/themes/windows/browser-aero.css
merging browser/themes/windows/browser.css
merging browser/themes/windows/compacttheme.css
merging browser/themes/windows/jar.mn
warning: conflicts while merging browser/themes/shared/compacttheme.inc.css! (edit, then use 'hg resolve --mark')
warning: conflicts while merging browser/themes/shared/tabs.inc.css! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)

Comment 20

[Michael Kohler [:mkohler]]

Comment on attachment 8893855 [details]
Bug 1366555 - Remove MOZ_PHOTON_THEME ifdefs and non-MOZ_PHOTON_THEME code

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/164688/diff/3-4/

Comment 21

[Michael Kohler [:mkohler]]

Rebased to current tip, now autoland should work. Could you please try again?

Comment 22

[Mozilla Autoland]

We're sorry, Autoland could not rebase your commits for you automatically. Please manually rebase your commits and try again.

hg error in cmd: hg rebase -s 7a5fdb838933 -d f4295d9cfcbe: rebasing 411907:7a5fdb838933 "Bug 1366555 - Remove MOZ_PHOTON_THEME ifdefs and non-MOZ_PHOTON_THEME code r=dao" (tip)
merging browser/app/profile/firefox.js
merging browser/base/content/tabbrowser.xml
merging browser/themes/shared/compacttheme.inc.css
merging browser/themes/shared/downloads/indicator.inc.css
merging browser/themes/shared/toolbarbutton-icons.inc.css
warning: conflicts while merging browser/themes/shared/compacttheme.inc.css! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)

Comment 23

[Dão Gottwald [:dao]]

Attachment: Bug 1366555 - Remove MOZ_PHOTON_THEME ifdefs and non-MOZ_PHOTON_THEME code.

Review commit: https://reviewboard.mozilla.org/r/165958/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/165958/

Comment 24

[Dão Gottwald [:dao]]

Comment on attachment 8894817 [details]
Bug 1366555 - Remove MOZ_PHOTON_THEME ifdefs and non-MOZ_PHOTON_THEME code.

https://reviewboard.mozilla.org/r/165958/#review171098

Comment 25

[Mozilla Autoland]

We're sorry, Autoland could not rebase your commits for you automatically. Please manually rebase your commits and try again.

hg error in cmd: hg rebase -s 8616efe9f51c -d 957ea94a9837: rebasing 412104:8616efe9f51c "Bug 1366555 - Remove MOZ_PHOTON_THEME ifdefs and non-MOZ_PHOTON_THEME code. r=dao" (tip)
merging browser/base/content/browser-pageActions.js
merging browser/base/content/browser-places.js
merging browser/base/content/browser.css
merging browser/base/content/browser.xul
merging browser/base/content/tabbrowser.xml
merging browser/components/customizableui/CustomizeMode.jsm
merging browser/extensions/pocket/bootstrap.js
merging browser/themes/linux/jar.mn
merging browser/themes/osx/jar.mn
merging browser/themes/shared/downloads/indicator.inc.css
merging browser/themes/shared/jar.inc.mn
merging browser/themes/shared/toolbarbutton-icons.inc.css
merging browser/themes/shared/toolbarbuttons.inc.css
merging browser/themes/shared/urlbar-searchbar.inc.css
merging browser/themes/windows/jar.mn
merging toolkit/modules/AppConstants.jsm
merging toolkit/moz.configure
warning: conflicts while merging browser/base/content/browser-places.js! (edit, then use 'hg resolve --mark')
warning: conflicts while merging browser/themes/shared/jar.inc.mn! (edit, then use 'hg resolve --mark')
warning: conflicts while merging browser/themes/shared/toolbarbutton-icons.inc.css! (edit, then use 'hg resolve --mark')
warning: conflicts while merging browser/themes/shared/toolbarbuttons.inc.css! (edit, then use 'hg resolve --mark')
warning: conflicts while merging browser/themes/shared/urlbar-searchbar.inc.css! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)

Comment 26

[Dão Gottwald [:dao]]

Comment on attachment 8894817 [details]
Bug 1366555 - Remove MOZ_PHOTON_THEME ifdefs and non-MOZ_PHOTON_THEME code.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/165958/diff/1-2/

Comment 27

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/5a3309f0bb85
Remove MOZ_PHOTON_THEME ifdefs and non-MOZ_PHOTON_THEME code. r=dao

Comment 28

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/5a3309f0bb85

Comment 29

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/6f4f01ff6b07
followup: Remove accidentally re-added code during rebase

Comment 30

[Sebastian Hengst [:aryx] (needinfo me if it's about an intermittent or backout)]

https://hg.mozilla.org/mozilla-central/rev/6f4f01ff6b07