jjgod

diff --git a/components/crash.gypi b/components/crash.gypi
index 70f7b0b..a1569d4 100644
--- a/components/crash.gypi
+++ b/components/crash.gypi
@@ -66,7 +66,7 @@
             '../sandbox/sandbox.gyp:sandbox',
           ],
         }],
-        ['os_posix == 1 and OS != "mac" and OS != "ios" and android_webview_build != 1', {
+        ['os_posix == 1 and OS != "ios" and android_webview_build != 1', {

jjgod

{
   "autofill": {
      "use_mac_address_book": false
   },
   "browser": {
      "window_placement": {
         "height": 755,
         "left": 22,
         "top": 44,
         "width": 1000

jjgod

hwdec=auto
sub-text-font="Hiragino Sans GB:style=Bold"
sub-text-font-size=60
sub-auto=fuzzy
sub-codepage=utf-8:gb18030
no-sub-ass
save-position-on-quit

jjgod

diff --git a/ui/gl/gl_context_cgl.cc b/ui/gl/gl_context_cgl.cc
index 689b936..292e9bf 100644
--- a/ui/gl/gl_context_cgl.cc
+++ b/ui/gl/gl_context_cgl.cc
@@ -120,17 +120,23 @@ bool GLContextCGL::Initialize(GLSurface* compatible_surface,
   return true;
 }
 
+void ReleaseCGLPixelFormat(CGLPixelFormatObj fmt) {
+  LOG(INFO) << "CGLReleasePixelFormat: " << CGLGetPixelFormatRetainCount(fmt);

jjgod

    Document focused element was set to nullptr on detach, but client
    wasn't informed so it still believes that the current focused url
    to be the one that no longer exists. It's a bit of a mystery how
    this code every worked though.
    
    BUG=425584

diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
index 4427c73..d4a4bac 100644
--- a/third_party/WebKit/Source/core/dom/Document.cpp

jjgod

From 0ae9d7914b44353fdc90c8dff0ef174e91d9f475 Mon Sep 17 00:00:00 2001
From: Jiang Jiang <[email protected]>
Date: Wed, 3 Dec 2014 16:43:47 +0100
Subject: [PATCH] DNA-30730: Backport WebKit patch to fix input button paddings

It's a backport of the following patch by [email protected]:

Subpixel Layout: Align <input type="button", submit> etc (PushButtonPart) top and bottom paddings with <button>

https://bugs.webkit.org/show_bug.cgi?id=127640

jjgod

From 96a780135d15645ae56bbfc09599cb0ddc9aea73 Mon Sep 17 00:00:00 2001
From: Jiang Jiang <[email protected]>
Date: Mon, 1 Dec 2014 23:31:55 +0100
Subject: [PATCH] Fix Apple Color Emoji support for OS X 10.7+

BUG=chromium:62435
---
 .../Source/platform/fonts/mac/FontCacheMac.mm      |  4 --
 third_party/skia/src/ports/SkFontHost_mac.cpp      | 58 +++++++++++++---------
 2 files changed, 34 insertions(+), 28 deletions(-)

jjgod

// systemfont.m

#import <Cocoa/Cocoa.h>

int main(int argc, char const *argv[]) {
    NSFont* font = [NSFont menuFontOfSize:18.0];

    CTFontRef ctFont = (CTFontRef)font;
    CFStringRef str = CFSTR("Opera");

jjgod

From 9b95e1237d6f4bba8fa1a5f9e16e439ef3c902d2 Mon Sep 17 00:00:00 2001
From: Jiang Jiang <[email protected]>
Date: Wed, 15 Oct 2014 15:54:58 +0200
Subject: [PATCH] Breakpad: Support passing direct callback for in process
 handling

---
 .../src/client/apple/Framework/BreakpadDefines.h    |  1 +
 breakpad/src/client/mac/Framework/Breakpad.h        | 16 ++++++++++++++++
 breakpad/src/client/mac/Framework/Breakpad.mm       | 21 ++++++++++++++++++++-

jjgod

diff --git a/content/browser/download/base_file_posix.cc b/content/browser/download/base_file_posix.cc
index 4cf987c..7dd88a8 100644
--- a/content/browser/download/base_file_posix.cc
+++ b/content/browser/download/base_file_posix.cc
@@ -21,6 +21,7 @@ DownloadInterruptReason BaseFile::MoveFileAndAdjustPermissions(
     int write_error = base::WriteFile(new_path, "", 0);
     if (write_error < 0)
       return LogSystemError("WriteFile", errno);
+    usleep(100);
   }