Skip to content

/ servo

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement viewport stuffs for window #1718 #6875

Closed
wants to merge 25 commits into from
Closed

Implement viewport stuffs for window #1718 #6875

wants to merge 25 commits into from
+454 −63

Commits on Jul 31, 2015

  1. viewport

    @farodin91
    farodin91 committed Jul 31, 2015
    40ff6cf

  2. Merge remote-tracking branch 'upstream/master' into window

    @farodin91
    farodin91 committed Jul 31, 2015
    a33ad54

  3. [WIP] Implement viewport stuffs for window #1718

    @farodin91
    farodin91 committed Jul 31, 2015
    Loading status checks…
    a9df5f2

Commits on Aug 2, 2015

  1. [WIP] Implement viewport stuffs for window #1718

    @farodin91
    farodin91 committed Aug 2, 2015
    Loading status checks…
    43d6d5e

Commits on Aug 4, 2015

  1. Merge branch 'window' of github.com:farodin91/servo into window 

    Conflicts:
	components/compositing/compositor.rs
	components/msg/compositor_msg.rs
	components/script/dom/webidls/Window.webidl
	components/script/dom/window.rs
	components/script/script_task.rs
	tests/html/viewport.html
    @farodin91
    farodin91 committed Aug 4, 2015
    cbaf83b

  2. Merging conflict

    @farodin91
    farodin91 committed Aug 4, 2015
    bb393cd

  3. Merging conflict 2

    @farodin91
    farodin91 committed Aug 4, 2015
    4557a5d

  4. Merge remote-tracking branch 'upstream/master' into window 

    Conflicts:
	components/script/dom/window.rs
    @farodin91
    farodin91 committed Aug 4, 2015
    Loading status checks…
    d289878

  5. last Conflict

    @farodin91
    farodin91 committed Aug 4, 2015
    Loading status checks…
    a5944c7

Commits on Aug 5, 2015

  1. Merge remote-tracking branch 'upstream/master' into window

    @farodin91
    farodin91 committed Aug 5, 2015
    Loading status checks…
    8d2008e

Commits on Aug 7, 2015

  1. review changes

    @farodin91
    farodin91 committed Aug 7, 2015
    6dabb5d

  2. Merge remote-tracking branch 'upstream/master' into window

    @farodin91
    farodin91 committed Aug 7, 2015
    a800294

  3. current state

    @farodin91
    farodin91 committed Aug 7, 2015
    Loading status checks…
    225d2ee

Commits on Aug 9, 2015

  1. most changes to the last review

    @farodin91
    farodin91 committed Aug 9, 2015
    cc7fc18

  2. Merge remote-tracking branch 'upstream/master' into window

    @farodin91
    farodin91 committed Aug 9, 2015
    Loading status checks…
    96ae3d4

  3. init support of smooth

    @farodin91
    farodin91 committed Aug 9, 2015
    Loading status checks…
    9a80339

Commits on Aug 14, 2015

  1. Merge remote-tracking branch 'upstream/master' into window

    @farodin91
    farodin91 committed Aug 14, 2015
    c4213b4

  2. review changes

    @farodin91
    farodin91 committed Aug 14, 2015
    Loading status checks…
    c0e028e

Commits on Aug 16, 2015

  1. Merging and fix review 

    Conflicts:
	components/msg/compositor_msg.rs
	components/script/dom/window.rs
	components/script/script_task.rs
    @farodin91
    farodin91 committed Aug 16, 2015
    Loading status checks…
    36d318b

  2. fix tidy

    @farodin91
    farodin91 committed Aug 16, 2015
    Loading status checks…
    10597e2

Commits on Aug 19, 2015

  1. Merge remote-tracking branch 'upstream/master' into window

    @farodin91
    farodin91 committed Aug 19, 2015
    38f318a

  2. fixing borrow_mut

    @farodin91
    farodin91 committed Aug 19, 2015
    Loading status checks…
    a9d703a

Commits on Aug 20, 2015

  1. Merge remote-tracking branch 'upstream/master' into window 

    Conflicts:
	components/compositing/compositor.rs
	components/msg/compositor_msg.rs
    @farodin91
    farodin91 committed Aug 20, 2015
    Loading status checks…
    3f3b176

Commits on Aug 27, 2015

  1. Merge remote-tracking branch 'upstream/master' into window 

    Conflicts:
	components/script/dom/window.rs
    @farodin91
    farodin91 committed Aug 27, 2015
    Loading status checks…
    5274eab

Commits on Sep 1, 2015

  1. Merge remote-tracking branch 'upstream/master' into window 

    Conflicts:
	components/compositing/headless.rs
	components/script/dom/window.rs
    @farodin91
    farodin91 committed Sep 1, 2015
    Loading status checks…
    f655800
You can’t perform that action at this time.