Permalink
Commits on Jun 21, 2012
  1. Merge branch 'master' into 1.6

    ariya committed Jun 21, 2012
  2. Only compress with UPX if it's available.

    ariya committed Jun 21, 2012
    Also, make sure we use the maximum compression level.
    
    http://code.google.com/p/phantomjs/issues/detail?id=599
Commits on Jun 20, 2012
  1. Merge branch 'master' into 1.6

    ariya committed Jun 20, 2012
  2. Merge pull request #278 from jonleighton/deploy

    ariya committed Jun 20, 2012
    fix lib paths for dump-symbols.sh
  3. Merge branch 'master' into 1.6

    ariya committed Jun 20, 2012
  4. Merge pull request #277 from jonleighton/deploy

    ariya committed Jun 20, 2012
    A couple of packaging script tweaks
Commits on Jun 19, 2012
  1. tweak/fix provision-vm.sh

    jonleighton committed Jun 19, 2012
  2. Undocument the callback mechanism.

    ariya committed Jun 19, 2012
    This is private for now, see issue 133 for details.
    
    http://code.google.com/p/phantomjs/issues/detail?id=133
  3. Merge pull request #276 from jonleighton/breakpad

    ariya committed Jun 19, 2012
    Breakpad / deploy stuff
  4. Merge pull request #275 from jonleighton/stacktraces

    ariya committed Jun 19, 2012
    Fix segfault when using e.g. console.error
Commits on Jun 18, 2012
  1. ignore deploy/brandelf

    jonleighton committed Jun 18, 2012
  2. Add breakpad support for Mac

    Tom Stuart & Jon Leighton authored and jonleighton committed Jun 18, 2012
    This provides support for compiling the breakpad client into PhantomJS,
    and generifies that Linux packaging scripts so that they also apply to
    OS X and automate the symbol generation.
    
    Building the Breakpad tool programs seems to be less than
    straightforward on OS X, and documentation is poor. We have managed to
    produce tools/dump-syms-mac.pro which allows building the dump_syms
    program for dumping the debugging symbols. This needed a couple of
    modifications to breakpad in order to compile successfully.
    
    We have run out of time to work on making the minidump_stackwalk program
    build. However, this is solely a developer tool and so it can wait until
    after the 1.6 release before we complete this work.
    
    Testing is welcome!
    
    https://code.google.com/p/phantomjs/issues/detail?id=576
  3. Fix segfault when using e.g. console.error

    jonleighton committed Jun 18, 2012
    When console.error was called, there was a segfault because it was
    treated as an uncaught exception, but did not have the correct stack
    trace information (I am not sure why, but still...)
    
    Now that we are generating the stackTrace in WebCore::reportException,
    the MessageType gets set correctly, so we can use this to differentiate
    between uncaught exceptions and other messages.
    
    https://code.google.com/p/phantomjs/issues/detail?id=47
  4. Merge pull request #273 from ferama/master

    ariya committed Jun 18, 2012
    fix wrong pdf margins using custom header/footer
  5. Merge pull request #272 from detro/master

    ariya committed Jun 18, 2012
    Minor adjustments before 1.6
  6. Changing the "working directory" to "/test" before running tests.

    detro committed Jun 18, 2012
    This fixes some issues with our tests, where we were erroneously failing.
  7. After discussing with @ariya on [Issue 547](http://code.google.com/p/…

    detro committed Jun 18, 2012
    …phantomjs/issues/detail?id=547), I reduced the methods to 1: rendereBase64(format).
    
    Available formats are the one supported by QImageWriter: http://qt-project.org/doc/qt-4.8/qimagewriter.html#supportedImageFormats.
    Formats can be entered in lower or uppercase: it gets normalised internally.
Commits on Jun 17, 2012
  1. Merge pull request #271 from jonleighton/deploy

    ariya committed Jun 17, 2012
    Provide scripts and workflow for building Linux packages for release.
  2. Fix qscriptengine.h after Qt update to 4.8.2.

    ariya committed Jun 17, 2012
    Our copy of Qt does not build QtScript, only uses the header file for an enum.
    
    As reported by Jon Leighton.
    
    http://code.google.com/p/phantomjs/issues/detail?id=495
  3. WebKit: Don't treat warnings as errors.

    ariya committed Jun 17, 2012
    This was added in Qt 4.8.2. Revert it until we solve all compiler
    warnings.
    
    http://code.google.com/p/phantomjs/issues/detail?id=495
  4. Merge remote-tracking branch 'neraliu/cookiesapi'

    ariya committed Jun 17, 2012
    Conflicts:
    	src/modules/webpage.js
    	src/webpage.h
Commits on Jun 16, 2012
  1. Don't pass an error object to the onError callback.

    jonleighton authored and ariya committed Jun 16, 2012
    On reflection, this approach seems like a bad idea and a source of bugs.
    I think passing object references between pages seems inherently
    problematic, and we are better off just passing data to the onError
    handler. If users need the actual object reference, they are able to use
    try ... catch within the page.
    
    This change also means that we are no longer breaking backwards
    compatibility with the page.onError function signature.
    
    WebCore already has a bunch of plumbing to pass around stacks. This
    exists for the inspector/console. However, we need to actually retrieve
    the error stack in WebCore::reportException.
    
    To achieve this, I am attaching a stackArray property to the error
    object. This is not as clean as I'd like, but seems ok for now. (We
    should not document stackArray though.)
    
    https://code.google.com/p/phantomjs/issues/detail?id=166
  2. Localize variables.

    jonleighton authored and ariya committed Jun 13, 2012
    This is to avoid adding a onError handler to the page that exists in the
    outer scope.
    
    https://code.google.com/p/phantomjs/issues/detail?id=166