Merge WebKit console and load deferrer changes.

webkit/webkit.gyp

 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'feature_defines': [
       'ENABLE_CHANNEL_MESSAGING=1',
       'ENABLE_DATABASE=1',
       'ENABLE_DASHBOARD_SUPPORT=0',
@@ skipping 2007 matching lines @@
         '../third_party/WebKit/WebCore/page/MouseEventWithHitTestResults.cpp',
         '../third_party/WebKit/WebCore/page/MouseEventWithHitTestResults.h',
         '../third_party/WebKit/WebCore/page/Navigator.cpp',
         '../third_party/WebKit/WebCore/page/Navigator.h',
         '../third_party/WebKit/WebCore/page/NavigatorBase.cpp',
         '../third_party/WebKit/WebCore/page/NavigatorBase.h',
         '../third_party/WebKit/WebCore/page/Page.cpp',
         '../third_party/WebKit/WebCore/page/Page.h',
         '../third_party/WebKit/WebCore/page/PageGroup.cpp',
         '../third_party/WebKit/WebCore/page/PageGroup.h',
+        '../third_party/WebKit/WebCore/page/PageGroupLoadDeferrer.cpp',
+        '../third_party/WebKit/WebCore/page/PageGroupLoadDeferrer.h',
         '../third_party/WebKit/WebCore/page/PositionCallback.h',
         '../third_party/WebKit/WebCore/page/PositionError.h',
         '../third_party/WebKit/WebCore/page/PositionErrorCallback.h',
         '../third_party/WebKit/WebCore/page/PositionOptions.h',
         '../third_party/WebKit/WebCore/page/PrintContext.cpp',
         '../third_party/WebKit/WebCore/page/PrintContext.h',
         '../third_party/WebKit/WebCore/page/Screen.cpp',
         '../third_party/WebKit/WebCore/page/Screen.h',
         '../third_party/WebKit/WebCore/page/SecurityOrigin.cpp',
         '../third_party/WebKit/WebCore/page/SecurityOrigin.h',
@@ skipping 2530 matching lines @@
           'sources!': [
             'glue/plugins/plugin_stubs.cc',
             # Used directly in test_shell* so it can be replaced in chromium.
             'glue/simple_clipboard_impl.cc',
           ],
         }],
       ],
     },
   ],
 }