Changeset 141358 in webkit


Ignore:
Timestamp:
Jan 30, 2013 6:17:35 PM (11 years ago)
Author:
thakis@chromium.org
Message:

[chromium] Build webkit with enable_web_intents set to 0.
https://bugs.webkit.org/show_bug.cgi?id=108408

Reviewed by Kentaro Hara.

I'll then make chromium build fine with that, then switch
enable_web_intents to 0, roll that into webkit, and then
actually remove the code hidden behind this flag.

Source/WebCore:

  • bindings/v8/custom/V8IntentCustom.cpp:

Source/WebKit/chromium:

  • WebKit.gyp:
  • features.gypi:
  • src/WebFrameImpl.cpp:
Location:
trunk/Source
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r141351 r141358  
     12013-01-30  Nico Weber  <thakis@chromium.org>
     2
     3        [chromium] Build webkit with enable_web_intents set to 0.
     4        https://bugs.webkit.org/show_bug.cgi?id=108408
     5
     6        Reviewed by Kentaro Hara.
     7
     8        I'll then make chromium build fine with that, then switch
     9        enable_web_intents to 0, roll that into webkit, and then
     10        actually remove the code hidden behind this flag.
     11
     12        * bindings/v8/custom/V8IntentCustom.cpp:
     13
    1142013-01-30  Joshua Bell  <jsbell@chromium.org>
    215
  • trunk/Source/WebCore/bindings/v8/custom/V8IntentCustom.cpp

    r139601 r141358  
    3939#include "V8MessagePort.h"
    4040#include <wtf/ArrayBuffer.h>
     41
     42#if ENABLE(WEB_INTENTS)
    4143
    4244namespace WebCore {
     
    8385}
    8486
     87} // namespace WebCore
    8588
    86 } // namespace WebCore
     89#endif
  • trunk/Source/WebKit/chromium/ChangeLog

    r141357 r141358  
     12013-01-30  Nico Weber  <thakis@chromium.org>
     2
     3        [chromium] Build webkit with enable_web_intents set to 0.
     4        https://bugs.webkit.org/show_bug.cgi?id=108408
     5
     6        Reviewed by Kentaro Hara.
     7
     8        I'll then make chromium build fine with that, then switch
     9        enable_web_intents to 0, roll that into webkit, and then
     10        actually remove the code hidden behind this flag.
     11
     12        * WebKit.gyp:
     13        * features.gypi:
     14        * src/WebFrameImpl.cpp:
     15
    1162013-01-30  Levi Weintraub  <leviw@chromium.org>
    217
  • trunk/Source/WebKit/chromium/WebKit.gyp

    r140951 r141358  
    795795                    ],
    796796                }],
     797                ['enable_web_intents==0', {
     798                  'sources!': [
     799                    'public/WebDeliveredIntentClient.h',
     800                    'public/WebIntent.h',
     801                    'public/WebIntentRequest.h',
     802                    'public/WebIntentServiceInfo.h',
     803                    'src/DeliveredIntentClientImpl.cpp',
     804                    'src/DeliveredIntentClientImpl.h',
     805                    'src/WebIntent.cpp',
     806                    'src/WebIntentRequest.cpp',
     807                    'src/WebIntentServiceInfo.cpp',
     808                  ],
     809                }],
    797810                ['use_default_render_theme==1', {
    798811                    'include_dirs': [
  • trunk/Source/WebKit/chromium/features.gypi

    r141241 r141358  
    131131      'ENABLE_VIEWPORT=1',
    132132      'ENABLE_WEBGL=1',
    133       'ENABLE_WEB_INTENTS=1',
     133      'ENABLE_WEB_INTENTS=<(enable_web_intents)',
    134134      'ENABLE_WEB_SOCKETS=1',
    135135      'ENABLE_WEB_TIMING=1',
     
    232232        ],
    233233      }],
    234       ['enable_web_intents==1', {
    235         'feature_defines': [
    236           'ENABLE_WEB_INTENTS=1',
    237         ],
    238       }],
    239234      ['enable_web_intents_tag==1', {
    240235        'feature_defines': [
  • trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp

    r141352 r141358  
    8484#include "DOMWindowIntents.h"
    8585#include "DOMWrapperWorld.h"
    86 #include "DeliveredIntent.h"
    87 #include "DeliveredIntentClientImpl.h"
    8886#include "DirectoryEntry.h"
    8987#include "Document.h"
     
    198196#include <wtf/HashMap.h>
    199197
     198#if ENABLE(WEB_INTENTS)
     199#include "DeliveredIntent.h"
     200#include "DeliveredIntentClientImpl.h"
     201#endif
     202
    200203using namespace WebCore;
    201204
Note: See TracChangeset for help on using the changeset viewer.