⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 199050 in webkit


Ignore:
Timestamp:
Apr 4, 2016, 11:17:52 PM (11 years ago)
Author:
bshafiei@apple.com
Message:

Merged r198850. rdar://problem/25489003

Location:
tags/Safari-602.1.26.0.2/Source/WebCore
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • tags/Safari-602.1.26.0.2/Source/WebCore/ChangeLog

    r198877 r199050  
     12016-04-04  Babak Shafiei  <bshafiei@apple.com>
     2
     3        Merge r198850.
     4
     5    2016-03-30  Brent Fulgham  <bfulgham@apple.com>
     6
     7            Avoid WebCore-prefixed paths when building WebCore
     8            https://bugs.webkit.org/show_bug.cgi?id=156027
     9
     10            Reviewed by David Kilzer.
     11
     12            Replace instances of '#include <WebCore/XXXYYY.h>"' with the normal
     13            '#include "XXXYYY.h"' for files inside WebCore.
     14
     15            * config.h:
     16            * inspector/InspectorTimelineAgent.cpp:
     17            * page/ViewportConfiguration.cpp:
     18            * platform/audio/ios/AudioDestinationIOS.cpp:
     19            * platform/cocoa/WebVideoFullscreenModel.h:
     20            * platform/cocoa/WebVideoFullscreenModelVideoElement.h:
     21            * platform/graphics/Font.h:
     22            * platform/graphics/ca/cocoa/LayerFlushSchedulerMac.cpp:
     23            * platform/graphics/cg/ColorCG.cpp:
     24            * platform/ios/WebVideoFullscreenInterfaceAVKit.h:
     25            * platform/mac/WebVideoFullscreenInterfaceMac.h:
     26            * platform/mock/MediaPlaybackTargetPickerMock.cpp:
     27
    1282016-03-30  Babak Shafiei  <bshafiei@apple.com>
    229
  • tags/Safari-602.1.26.0.2/Source/WebCore/config.h

    r198547 r199050  
    3131
    3232#if PLATFORM(WIN) && !USE(WINGDI)
    33 #include <WebCore/WebCoreHeaderDetection.h>
     33#include "WebCoreHeaderDetection.h"
    3434#endif
    3535
  • tags/Safari-602.1.26.0.2/Source/WebCore/inspector/InspectorTimelineAgent.cpp

    r197628 r199050  
    4949#if PLATFORM(IOS)
    5050#include "RuntimeApplicationChecks.h"
    51 #include <WebCore/WebCoreThread.h>
     51#include "WebCoreThread.h"
    5252#endif
    5353
    5454#if PLATFORM(COCOA)
    55 #include <WebCore/RunLoopObserver.h>
     55#include "RunLoopObserver.h"
    5656#endif
    5757
  • tags/Safari-602.1.26.0.2/Source/WebCore/page/ViewportConfiguration.cpp

    r197986 r199050  
    2727#include "ViewportConfiguration.h"
    2828
    29 #include <WebCore/TextStream.h>
     29#include "TextStream.h"
    3030#include <wtf/Assertions.h>
    3131#include <wtf/MathExtras.h>
  • tags/Safari-602.1.26.0.2/Source/WebCore/platform/audio/ios/AudioDestinationIOS.cpp

    r198035 r199050  
    3939#include "Logging.h"
    4040#include "Page.h"
     41#include "RuntimeApplicationChecks.h"
    4142#include "SoftLinking.h"
    4243#include <AudioToolbox/AudioServices.h>
    43 #include <WebCore/RuntimeApplicationChecks.h>
    4444#include <wtf/HashSet.h>
    4545#include <wtf/NeverDestroyed.h>
  • tags/Safari-602.1.26.0.2/Source/WebCore/platform/cocoa/WebVideoFullscreenModel.h

    r195755 r199050  
    3030#if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
    3131
    32 #include <WebCore/FloatRect.h>
    33 #include <WebCore/HTMLMediaElementEnums.h>
     32#include "FloatRect.h"
     33#include "HTMLMediaElementEnums.h"
    3434
    3535namespace WebCore {
  • tags/Safari-602.1.26.0.2/Source/WebCore/platform/cocoa/WebVideoFullscreenModelVideoElement.h

    r197563 r199050  
    3030#if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
    3131
    32 #include <WebCore/EventListener.h>
    33 #include <WebCore/FloatRect.h>
    34 #include <WebCore/HTMLMediaElementEnums.h>
    35 #include <WebCore/PlatformLayer.h>
    36 #include <WebCore/WebVideoFullscreenModel.h>
     32#include "EventListener.h"
     33#include "FloatRect.h"
     34#include "HTMLMediaElementEnums.h"
     35#include "PlatformLayer.h"
     36#include "WebVideoFullscreenModel.h"
    3737#include <wtf/RefPtr.h>
    3838#include <wtf/RetainPtr.h>
  • tags/Safari-602.1.26.0.2/Source/WebCore/platform/graphics/Font.h

    r198074 r199050  
    5555
    5656#if USE(CG)
    57 #include <WebCore/CoreGraphicsSPI.h>
     57#include "CoreGraphicsSPI.h"
    5858#endif
    5959
  • tags/Safari-602.1.26.0.2/Source/WebCore/platform/graphics/ca/cocoa/LayerFlushSchedulerMac.cpp

    r197628 r199050  
    3131#if PLATFORM(IOS)
    3232#include "RuntimeApplicationChecks.h"
     33#include "WebCoreThread.h"
    3334#include <CoreFoundation/CFBundle.h>
    34 #include <WebCore/WebCoreThread.h>
    3535#endif
    3636
  • tags/Safari-602.1.26.0.2/Source/WebCore/platform/graphics/cg/ColorCG.cpp

    r195392 r199050  
    3636#include <ApplicationServices/ApplicationServices.h>
    3737#else
    38 #include <WebCore/CoreGraphicsSPI.h>
     38#include "CoreGraphicsSPI.h"
    3939#include <wtf/StdLibExtras.h>
    4040#endif // !PLATFORM(IOS)
  • tags/Safari-602.1.26.0.2/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h

    r197563 r199050  
    3030#if PLATFORM(IOS)
    3131
    32 #include <WebCore/EventListener.h>
    33 #include <WebCore/HTMLMediaElementEnums.h>
    34 #include <WebCore/PlatformLayer.h>
    35 #include <WebCore/Timer.h>
    36 #include <WebCore/WebVideoFullscreenInterface.h>
     32#include "EventListener.h"
     33#include "HTMLMediaElementEnums.h"
     34#include "PlatformLayer.h"
     35#include "Timer.h"
     36#include "WebVideoFullscreenInterface.h"
    3737#include <functional>
    3838#include <objc/objc.h>
  • tags/Safari-602.1.26.0.2/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.h

    r197893 r199050  
    2929#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
    3030
    31 #include <WebCore/HTMLMediaElementEnums.h>
    32 #include <WebCore/WebVideoFullscreenInterface.h>
     31#include "HTMLMediaElementEnums.h"
     32#include "WebVideoFullscreenInterface.h"
    3333#include <wtf/RefCounted.h>
    3434#include <wtf/RetainPtr.h>
  • tags/Safari-602.1.26.0.2/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp

    r197429 r199050  
    2929#if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
    3030
     31#include "FloatRect.h"
    3132#include "Logging.h"
    32 #include <WebCore/FloatRect.h>
    33 #include <WebCore/MediaPlaybackTargetMock.h>
    34 #include <WebCore/WebMediaSessionManager.h>
     33#include "MediaPlaybackTargetMock.h"
     34#include "WebMediaSessionManager.h"
    3535
    3636using namespace WebCore;
Note: See TracChangeset for help on using the changeset viewer.