zenoalbisser

commit cc4411da548016a7bcd94678e63b89170b852012
Author: Zeno Albisser <zeno.albisser@digia.com>
Date:   Thu Sep 12 22:36:42 2013 +0200

    debug that one

diff --git a/common.c b/common.c
index dec4589..7079c2b 100644
--- a/common.c
+++ b/common.c

zenoalbisser

diff --git a/me.c b/me.c
index 8c7d49f..bd9d3c0 100644
--- a/me.c
+++ b/me.c
@@ -64,8 +64,11 @@ static void me_block_8x8(struct c63_common *cm, int mb_x, int mb_y,
   /* Here, there should be a threshold on SAD that checks if the motion vector
      is cheaper than intraprediction. We always assume MV to be beneficial */
 
-  /* printf("Using motion vector (%d, %d) with SAD %d\n", mb->mv_x, mb->mv_y,
-     best_sad); */

zenoalbisser

cd resources/ && ( test -e Makefile || /Users/zeno/work/qt5/qtbase/bin/qmake /Users/zeno/work/qtwebengine/resources/resources.pro -o Makefile ) && make -f Makefile 
make[1]: Nothing to be done for `first'.
cd shared/ && ( test -e Makefile || /Users/zeno/work/qt5/qtbase/bin/qmake /Users/zeno/work/qtwebengine/shared/shared.pro -o Makefile ) && make -f Makefile 
make[1]: Nothing to be done for `first'.
cd lib/ && ( test -e Makefile || /Users/zeno/work/qt5/qtbase/bin/qmake /Users/zeno/work/qtwebengine/lib/lib.pro -o Makefile ) && make -f Makefile 
make[1]: Nothing to be done for `first'.
cd process/ && ( test -e Makefile || /Users/zeno/work/qt5/qtbase/bin/qmake /Users/zeno/work/qtwebengine/process/process.pro -o Makefile ) && make -f Makefile 
make[1]: Nothing to be done for `first'.
cd build/ && ( test -e Makefile || /Users/zeno/work/qt5/qtbase/bin/qmake /Users/zeno/work/qtwebengine/build/build.pro -o Makefile ) && make -f Makefile 
/Users/zeno/work/qtwebengine/3rdparty/ninja/ninja -C /Users/zeno/work/qtwebengin

zenoalbisser

$ clang++ --version
Apple LLVM version 4.2 (clang-425.0.24) (based on LLVM 3.2svn)
Target: x86_64-apple-darwin12.3.0
Thread model: posix

$ clang++ -MMD -MF obj/chromium/ui/gfx/image/ui.image_family.o.d -DANGLE_DX11 -DCHROMIUM_BUILD -DUSE_LIBJPEG_TURBO=1 -DUSE_UNORDERED_CONTAINERS=1 -DENABLE_ONE_CLICK_SIGNIN -DENABLE_REMOTING=1 -DENABLE_WEBRTC=1 -DENABLE_PEPPER_CDMS -DENABLE_CONFIGURATION_POLICY -DENABLE_INPUT_SPEECH -DENABLE_NOTIFICATIONS -DENABLE_HIDPI=1 -DENABLE_GPU=1 -DENABLE_EGLIMAGE=1 -DENABLE_TASK_MANAGER=1 -DENABLE_EXTENSIONS=1 -DENABLE_PLUGIN_INSTALLATION=1 -DENABLE_PLUGINS=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_THEMES=1 -DENABLE_AUTOFILL_DIALOG=1 -DENABLE_BACKGROUND=1 -DENABLE_AUTOMATION=1 -DENABLE_GOOGLE_NOW=1 -DENABLE_LANGUAGE_DETECTION=1 -DENABLE_PRINTING=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_APP_LIST=1 -DENABLE_SETTINGS_APP=1 -DENABLE_MANAGED_USERS=1 -DUI_IMPLEMENTATION -DSK_ENABLE_INST_COUNT=0 -DSK_SUPPORT_GPU=1 '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' -DSK_USE_POSIX_THREADS 

zenoalbisser

diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp b/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp
index e8e646a..fdde3d2 100644
--- a/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp
+++ b/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp
@@ -32,6 +32,8 @@
 #include <WKPage.h>
 #include <WebCore/CoordinatedGraphicsScene.h>
 
+#include <QDateTime>
+

zenoalbisser

Updating projects from gyp files...
parse exception: run GRIT with the -x flag to debug .grd problems
Traceback (most recent call last):
  File "./gyp_chromium", line 148, in <module>
    sys.exit(gyp.main(args))
  File "/Users/zeno/work/blink/src/tools/gyp/pylib/gyp/__init__.py", line 526, in main
    return gyp_main(args)
  File "/Users/zeno/work/blink/src/tools/gyp/pylib/gyp/__init__.py", line 502, in gyp_main
    options.circular_check)
  File "/Users/zeno/work/blink/src/tools/gyp/pylib/gyp/__init__.py", line 131, in Load

zenoalbisser

-bash: ./gyp_chromium: No such file or directory

zenoalbisser

Updating projects from gyp files...
parse exception: run GRIT with the -x flag to debug .grd problems

zenoalbisser

commit 67ce3e54c7cce448e75c51ef786fe9483a286891
Author: Zeno Albisser <zeno@webkit.org>
Date:   Tue Dec 18 16:59:50 2012 +0100

    update TestExpecations for WebGL on mac

diff --git a/LayoutTests/platform/qt-5.0-wk2-mac/TestExpectations b/LayoutTests/platform/qt-5.0-wk2-mac/TestExpectations
new file mode 100644
index 0000000..8e28762
--- /dev/null

zenoalbisser

diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm
index 3cfe5cb..65a05c0 100644
--- a/src/widgets/styles/qmacstyle_mac.mm
+++ b/src/widgets/styles/qmacstyle_mac.mm
@@ -2830,6 +2830,12 @@ int QMacStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget *w
     case SH_DockWidget_ButtonsHaveFrame:
         ret = false;
         break;
+    case SH_ScrollBar_Transient:
+        ret = QSysInfo::MacintoshVersion >= QSysInfo::MV_10_7;