From d96f088adaf31fa9d0378be3a99fb72e1b2577a9 Mon Sep 17 00:00:00 2001 From: patr0nus Date: Tue, 29 Jul 2014 23:36:50 +0800 Subject: [PATCH] 0.10.0-rc1 --- src-third_party-Webkit.diff | 179 +++++++++++++++ src.diff | 420 ++++++++++++++++++++++++++++++++++++ 2 files changed, 599 insertions(+) create mode 100644 src-third_party-Webkit.diff create mode 100644 src.diff diff --git a/src-third_party-Webkit.diff b/src-third_party-Webkit.diff new file mode 100644 index 0000000..f066960 --- /dev/null +++ b/src-third_party-Webkit.diff @@ -0,0 +1,179 @@ +diff --git a/Source/core/rendering/RenderThemeChromiumMac.mm b/Source/core/rendering/RenderThemeChromiumMac.mm +index 4f41185..d85acc0 100644 +--- a/Source/core/rendering/RenderThemeChromiumMac.mm ++++ b/Source/core/rendering/RenderThemeChromiumMac.mm +@@ -142,14 +142,14 @@ const double progressAnimationNumFrames = 256; + } + + @end +- ++/*MAS + // Forward declare Mac SPIs. + extern "C" { + void _NSDrawCarbonThemeBezel(NSRect frame, BOOL enabled, BOOL flipped); + // Request for public API: rdar://13787640 + void _NSDrawCarbonThemeListBox(NSRect frame, BOOL enabled, BOOL flipped, BOOL always_yes); + } +- ++*/ + namespace WebCore { + + using namespace HTMLNames; +@@ -770,7 +770,7 @@ bool RenderThemeChromiumMac::paintTextField(RenderObject* o, const PaintInfo& pa + // of painting its own background. We need WebCore to paint styled backgrounds, so we'll use + // this AppKit SPI function instead. + if (!useNSTextFieldCell) { +- _NSDrawCarbonThemeBezel(r, isEnabled(o) && !isReadOnlyControl(o), YES); ++ //_NSDrawCarbonThemeBezel(r, isEnabled(o) && !isReadOnlyControl(o), YES);MAS + return false; + } + #endif +@@ -852,7 +852,7 @@ bool RenderThemeChromiumMac::paintCapsLockIndicator(RenderObject*, const PaintIn + bool RenderThemeChromiumMac::paintTextArea(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r) + { + LocalCurrentGraphicsContext localContext(paintInfo.context); +- _NSDrawCarbonThemeListBox(r, isEnabled(o) && !isReadOnlyControl(o), YES, YES); ++ //_NSDrawCarbonThemeListBox(r, isEnabled(o) && !isReadOnlyControl(o), YES, YES);MAS + return false; + } + +diff --git a/Source/platform/fonts/mac/ComplexTextControllerCoreText.mm b/Source/platform/fonts/mac/ComplexTextControllerCoreText.mm +index 86bc893..d9fac9c 100644 +--- a/Source/platform/fonts/mac/ComplexTextControllerCoreText.mm ++++ b/Source/platform/fonts/mac/ComplexTextControllerCoreText.mm +@@ -32,12 +32,13 @@ + + #include + #import +- ++/*MAS + // Forward declare Mac SPIs. + extern "C" { + // Request for public API: rdar://13803619 + CTLineRef CTLineCreateWithUniCharProvider(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void* context), void (*dispose)(const UniChar* chars, void* context), void* context); + } ++*/ + + @interface WebCascadeList : NSArray { + @private +@@ -236,7 +237,7 @@ void ComplexTextController::collectComplexTextRunsForCharacters(const UChar* cp, + } else { + ProviderInfo info = { cp, length, stringAttributes.get() }; + +- line.adoptCF(CTLineCreateWithUniCharProvider(&provideStringAndAttributes, 0, &info)); ++ //line.adoptCF(CTLineCreateWithUniCharProvider(&provideStringAndAttributes, 0, &info)); + } + + m_coreTextLines.append(line.get()); +diff --git a/Source/platform/fonts/mac/SimpleFontDataMac.mm b/Source/platform/fonts/mac/SimpleFontDataMac.mm +index c8e4421..db203b7 100644 +--- a/Source/platform/fonts/mac/SimpleFontDataMac.mm ++++ b/Source/platform/fonts/mac/SimpleFontDataMac.mm +@@ -59,9 +59,9 @@ enum CGFontRenderingMode { + extern "C" { + // Request for public API: rdar://13803586 + bool CGFontGetGlyphAdvancesForStyle(CGFontRef font, CGAffineTransform* transform, CGFontRenderingMode renderingMode, ATSGlyphRef* glyph, size_t count, CGSize* advance); +- ++//CTLineRef CTLineCreateWithAttributedString(CFAttributedStringRef string); + // Request for public API: rdar://13803619 +-CTLineRef CTLineCreateWithUniCharProvider(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void* context), void (*dispose)(const UniChar* chars, void* context), void* context); ++//CTLineRef CTLineCreateWithUniCharProvider(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void* context), void (*dispose)(const UniChar* chars, void* context), void* context); + } + + static CGFontRenderingMode cgFontRenderingModeForNSFont(NSFont* font) { +@@ -413,7 +413,7 @@ static const UniChar* provideStringAndAttributes(CFIndex stringIndex, CFIndex* c + bool SimpleFontData::canRenderCombiningCharacterSequence(const UChar* characters, size_t length) const + { + ASSERT(isMainThread()); +- ++/*MAS + if (!m_combiningCharacterSequenceSupport) + m_combiningCharacterSequenceSupport = adoptPtr(new HashMap); + +@@ -423,8 +423,9 @@ bool SimpleFontData::canRenderCombiningCharacterSequence(const UChar* characters + + RetainPtr cgFont(AdoptCF, CTFontCopyGraphicsFont(platformData().ctFont(), 0)); + +- ProviderInfo info = { characters, length, getCFStringAttributes(0, platformData().orientation()) }; +- RetainPtr line(AdoptCF, CTLineCreateWithUniCharProvider(&provideStringAndAttributes, 0, &info)); ++ //ProviderInfo info = { characters, length, getCFStringAttributes(0, platformData().orientation()) }; ++ CFAttributedStringRef attrStr = CFAttributedStringCreate(NULL, characters, getCFStringAttributes(0, platformData().orientation())) ++ RetainPtr line(AdoptCF, CTLineCreateWithAttributedString(attrStr)); + + CFArrayRef runArray = CTLineGetGlyphRuns(line.get()); + CFIndex runCount = CFArrayGetCount(runArray); +@@ -439,7 +440,7 @@ bool SimpleFontData::canRenderCombiningCharacterSequence(const UChar* characters + return false; + } + +- addResult.storedValue->value = true; ++ addResult.storedValue->value = true;*/ + return true; + } + +diff --git a/Source/platform/mac/KillRingMac.mm b/Source/platform/mac/KillRingMac.mm +index 350a646..2dcf8b6 100644 +--- a/Source/platform/mac/KillRingMac.mm ++++ b/Source/platform/mac/KillRingMac.mm +@@ -27,7 +27,7 @@ + #import "platform/KillRing.h" + + namespace WebCore { +- ++/*MAS + extern "C" { + + // Kill ring calls. Would be better to use NSKillRing.h, but that's not available as API or SPI. +@@ -40,44 +40,45 @@ void _NSNewKillRingSequence(); + void _NSSetKillRingToYankedState(); + + } +- ++*/ + static void initializeKillRingIfNeeded() + { + static bool initializedKillRing = false; + if (!initializedKillRing) { + initializedKillRing = true; +- _NSInitializeKillRing(); ++ //_NSInitializeKillRing(); + } + } + + void KillRing::append(const String& string) + { + initializeKillRingIfNeeded(); +- _NSAppendToKillRing(string); ++ //_NSAppendToKillRing(string); + } + + void KillRing::prepend(const String& string) + { + initializeKillRingIfNeeded(); +- _NSPrependToKillRing(string); ++ //_NSPrependToKillRing(string); + } + + String KillRing::yank() + { + initializeKillRingIfNeeded(); +- return _NSYankFromKillRing(); ++ return String(); ++ //return _NSYankFromKillRing(); + } + + void KillRing::startNewSequence() + { + initializeKillRingIfNeeded(); +- _NSNewKillRingSequence(); ++ //_NSNewKillRingSequence(); + } + + void KillRing::setToYankedState() + { + initializeKillRingIfNeeded(); +- _NSSetKillRingToYankedState(); ++ //_NSSetKillRingToYankedState(); + } + + } // namespace WebCore diff --git a/src.diff b/src.diff new file mode 100644 index 0000000..3a31cb5 --- /dev/null +++ b/src.diff @@ -0,0 +1,420 @@ +diff --git a/chrome/common/chrome_constants.cc b/chrome/common/chrome_constants.cc +index 92d88e7..f2bb8c8 100644 +--- a/chrome/common/chrome_constants.cc ++++ b/chrome/common/chrome_constants.cc +@@ -192,7 +192,7 @@ const base::FilePath::CharType kSingletonCookieFilename[] = + FPL("SingletonCookie"); + const base::FilePath::CharType kSingletonLockFilename[] = FPL("SingletonLock"); + const base::FilePath::CharType kSingletonSocketFilename[] = +- FPL("SingletonSocket"); ++ FPL("S");//MAS:SingletonSocket + const base::FilePath::CharType kSyncCredentialsFilename[] = + FPL("Sync Credentials"); + const base::FilePath::CharType kThemePackFilename[] = FPL("Cached Theme.pak"); +diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm +index f1565eb..f332ccc 100644 +--- a/content/browser/accessibility/browser_accessibility_cocoa.mm ++++ b/content/browser/accessibility/browser_accessibility_cocoa.mm +@@ -20,7 +20,7 @@ + // See http://openradar.appspot.com/9896491. This SPI has been tested on 10.5, + // 10.6, and 10.7. It allows accessibility clients to observe events posted on + // this object. +-extern "C" void NSAccessibilityUnregisterUniqueIdForUIElement(id element); ++//extern "C" void NSAccessibilityUnregisterUniqueIdForUIElement(id element);MAS + + using ui::AXNodeData; + using content::BrowserAccessibility; +@@ -317,7 +317,7 @@ NSDictionary* attributeToMethodNameMap = nil; + + - (void)detach { + if (browserAccessibility_) { +- NSAccessibilityUnregisterUniqueIdForUIElement(self); ++ //NSAccessibilityUnregisterUniqueIdForUIElement(self);MAS + browserAccessibility_ = NULL; + } + } +diff --git a/content/browser/device_monitor_mac.mm b/content/browser/device_monitor_mac.mm +index 10dd620..657ab57 100644 +--- a/content/browser/device_monitor_mac.mm ++++ b/content/browser/device_monitor_mac.mm +@@ -4,7 +4,8 @@ + + #include "content/browser/device_monitor_mac.h" + +-#import ++//#import MAS ++#import //MAS + + #include + +@@ -142,6 +143,7 @@ class QTKitMonitorImpl : public DeviceMonitorMacImpl { + + QTKitMonitorImpl::QTKitMonitorImpl(content::DeviceMonitorMac* monitor) + : DeviceMonitorMacImpl(monitor) { ++ /*MAS + NSNotificationCenter* nc = [NSNotificationCenter defaultCenter]; + device_arrival_ = + [nc addObserverForName:QTCaptureDeviceWasConnectedNotification +@@ -161,25 +163,31 @@ QTKitMonitorImpl::QTKitMonitorImpl(content::DeviceMonitorMac* monitor) + queue:nil + usingBlock:^(NSNotification* notification) { + OnAttributeChanged(notification);}]; ++ */ + } + + QTKitMonitorImpl::~QTKitMonitorImpl() { ++/*MAS + NSNotificationCenter* nc = [NSNotificationCenter defaultCenter]; + [nc removeObserver:device_arrival_]; + [nc removeObserver:device_removal_]; + [nc removeObserver:device_change_]; ++*/ + } + + void QTKitMonitorImpl::OnAttributeChanged( + NSNotification* notification) { ++ /*MAS + if ([[[notification userInfo] + objectForKey:QTCaptureDeviceChangedAttributeKey] + isEqualToString:QTCaptureDeviceSuspendedAttribute]) { + OnDeviceChanged(); + } ++ */ + } + + void QTKitMonitorImpl::OnDeviceChanged() { ++/*MAS + std::vector snapshot_devices; + + NSArray* devices = [QTCaptureDevice inputDevices]; +@@ -204,6 +212,7 @@ void QTKitMonitorImpl::OnDeviceChanged() { + DeviceInfo([[device uniqueID] UTF8String], device_type)); + } + ConsolidateDevicesListAndNotify(snapshot_devices); ++*/ + } + + // Forward declaration for use by CrAVFoundationDeviceObserver. +@@ -373,7 +382,7 @@ void DeviceMonitorMac::StartMonitoring() { + void DeviceMonitorMac::NotifyDeviceChanged( + base::SystemMonitor::DeviceType type) { + // TODO(xians): Remove the global variable for SystemMonitor. +- base::SystemMonitor::Get()->ProcessDevicesChanged(type); ++ //base::SystemMonitor::Get()->ProcessDevicesChanged(type);MAS + } + + } // namespace content +diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm +index f807fa2..f023b9d 100644 +--- a/content/browser/renderer_host/render_widget_host_view_mac.mm ++++ b/content/browser/renderer_host/render_widget_host_view_mac.mm +@@ -1412,7 +1412,7 @@ void RenderWidgetHostViewMac::CompositorSwapBuffers( + { + gfx::ScopedCGLSetCurrentContext scoped_set_current_context( + compositing_iosurface_context_->cgl_context()); +- glFlush(); ++ //glFlush();MAS??? + } + compositing_iosurface_->CopyToVideoFrame( + gfx::Rect(size), frame, +@@ -3796,9 +3796,9 @@ static const NSTrackingRectTag kTrackingRectTag = 0xBADFACE; + // Since this implementation doesn't have to wait any IPC calls, this doesn't + // make any key-typing jank. --hbono 7/23/09 + // +-extern "C" { +-extern NSString *NSTextInputReplacementRangeAttributeName; +-} ++//extern "C" { ++//extern NSString *NSTextInputReplacementRangeAttributeName;MAS ++//} + + - (NSArray *)validAttributesForMarkedText { + // This code is just copied from WebKit except renaming variables. +@@ -3807,7 +3807,7 @@ extern NSString *NSTextInputReplacementRangeAttributeName; + NSUnderlineStyleAttributeName, + NSUnderlineColorAttributeName, + NSMarkedClauseSegmentAttributeName, +- NSTextInputReplacementRangeAttributeName, ++ //NSTextInputReplacementRangeAttributeName,MAS + nil]); + } + return validAttributesForMarkedText_.get(); +diff --git a/media/media.gyp b/media/media.gyp +index fa06e15..a30c4b7 100644 +--- a/media/media.gyp ++++ b/media/media.gyp +@@ -788,7 +788,6 @@ + '$(SDKROOT)/System/Library/Frameworks/CoreMIDI.framework', + '$(SDKROOT)/System/Library/Frameworks/CoreVideo.framework', + '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', +- '$(SDKROOT)/System/Library/Frameworks/QTKit.framework', + ], + }, + }], +diff --git a/media/video/capture/mac/video_capture_device_mac.h b/media/video/capture/mac/video_capture_device_mac.h +index 3b12d83..21b3f34 100644 +--- a/media/video/capture/mac/video_capture_device_mac.h ++++ b/media/video/capture/mac/video_capture_device_mac.h +@@ -17,7 +17,7 @@ + #include "media/video/capture/video_capture_device.h" + #include "media/video/capture/video_capture_types.h" + +-@protocol PlatformVideoCapturingMac; ++//@protocol PlatformVideoCapturingMac;MAS + + namespace base { + class SingleThreadTaskRunner; +@@ -76,7 +76,7 @@ class VideoCaptureDeviceMac : public VideoCaptureDevice { + const scoped_refptr task_runner_; + InternalState state_; + +- id capture_device_; ++ //id capture_device_;MAS + + // Used with Bind and PostTask to ensure that methods aren't called after the + // VideoCaptureDeviceMac is destroyed. +diff --git a/media/video/capture/mac/video_capture_device_mac.mm b/media/video/capture/mac/video_capture_device_mac.mm +index 7b88037..ccc7408 100644 +--- a/media/video/capture/mac/video_capture_device_mac.mm ++++ b/media/video/capture/mac/video_capture_device_mac.mm +@@ -12,7 +12,7 @@ + #import "media/video/capture/mac/avfoundation_glue.h" + #import "media/video/capture/mac/platform_video_capturing_mac.h" + #import "media/video/capture/mac/video_capture_device_avfoundation_mac.h" +-#import "media/video/capture/mac/video_capture_device_qtkit_mac.h" ++//#import "media/video/capture/mac/video_capture_device_qtkit_mac.h"MAS + + namespace media { + +@@ -64,6 +64,7 @@ void GetBestMatchSupportedResolution(int* width, int* height) { + } + + void VideoCaptureDevice::GetDeviceNames(Names* device_names) { ++/*MAS + // Loop through all available devices and add to |device_names|. + device_names->clear(); + +@@ -80,6 +81,7 @@ void VideoCaptureDevice::GetDeviceNames(Names* device_names) { + [key UTF8String]); + device_names->push_back(name); + } ++*/ + } + + // static +@@ -95,6 +97,7 @@ void VideoCaptureDevice::GetDeviceSupportedFormats(const Name& device, + } + + const std::string VideoCaptureDevice::Name::GetModel() const { ++/* + // Both PID and VID are 4 characters. + if (unique_id_.size() < 2 * kVidPidSize) { + return ""; +@@ -107,9 +110,12 @@ const std::string VideoCaptureDevice::Name::GetModel() const { + std::string id_product = unique_id_.substr(pid_location, kVidPidSize); + + return id_vendor + ":" + id_product; ++ MAS*/ ++ return "";//MAS + } + + VideoCaptureDevice* VideoCaptureDevice::Create(const Name& device_name) { ++/* + VideoCaptureDeviceMac* capture_device = + new VideoCaptureDeviceMac(device_name); + if (!capture_device->Init()) { +@@ -118,6 +124,8 @@ VideoCaptureDevice* VideoCaptureDevice::Create(const Name& device_name) { + capture_device = NULL; + } + return capture_device; ++MAS*/ ++ return NULL;//MAS + } + + VideoCaptureDeviceMac::VideoCaptureDeviceMac(const Name& device_name) +@@ -125,19 +133,22 @@ VideoCaptureDeviceMac::VideoCaptureDeviceMac(const Name& device_name) + tried_to_square_pixels_(false), + task_runner_(base::MessageLoopProxy::current()), + state_(kNotInitialized), +- capture_device_(nil), ++ //capture_device_(nil),MAS + weak_factory_(this) { + final_resolution_selected_ = AVFoundationGlue::IsAVFoundationSupported(); + } + + VideoCaptureDeviceMac::~VideoCaptureDeviceMac() { ++/*MAS + DCHECK(task_runner_->BelongsToCurrentThread()); + [capture_device_ release]; ++*/ + } + + void VideoCaptureDeviceMac::AllocateAndStart( + const VideoCaptureParams& params, + scoped_ptr client) { ++ /*MAS + DCHECK(task_runner_->BelongsToCurrentThread()); + if (state_ != kIdle) { + return; +@@ -188,9 +199,11 @@ void VideoCaptureDeviceMac::AllocateAndStart( + } + + state_ = kCapturing; ++ */ + } + + void VideoCaptureDeviceMac::StopAndDeAllocate() { ++/*MAS + DCHECK(task_runner_->BelongsToCurrentThread()); + DCHECK(state_ == kCapturing || state_ == kError) << state_; + [capture_device_ stopCapture]; +@@ -200,9 +213,11 @@ void VideoCaptureDeviceMac::StopAndDeAllocate() { + client_.reset(); + state_ = kIdle; + tried_to_square_pixels_ = false; ++ */ + } + + bool VideoCaptureDeviceMac::Init() { ++/*MAS + DCHECK(task_runner_->BelongsToCurrentThread()); + DCHECK_EQ(state_, kNotInitialized); + +@@ -232,6 +247,8 @@ bool VideoCaptureDeviceMac::Init() { + + state_ = kIdle; + return true; ++ */ ++ return false;//MAS + } + + void VideoCaptureDeviceMac::ReceiveFrame( +@@ -240,6 +257,7 @@ void VideoCaptureDeviceMac::ReceiveFrame( + const VideoCaptureFormat& frame_format, + int aspect_numerator, + int aspect_denominator) { ++ /*MAS + // This method is safe to call from a device capture thread, i.e. any thread + // controlled by QTKit/AVFoundation. + if (!final_resolution_selected_) { +@@ -308,23 +326,29 @@ void VideoCaptureDeviceMac::ReceiveFrame( + capture_format_, + 0, + base::TimeTicks::Now()); ++ */ + } + + void VideoCaptureDeviceMac::ReceiveError(const std::string& reason) { ++/*MAS + task_runner_->PostTask(FROM_HERE, + base::Bind(&VideoCaptureDeviceMac::SetErrorState, + weak_factory_.GetWeakPtr(), + reason)); ++ */ + } + + void VideoCaptureDeviceMac::SetErrorState(const std::string& reason) { ++/*MAS + DCHECK(task_runner_->BelongsToCurrentThread()); + DLOG(ERROR) << reason; + state_ = kError; + client_->OnError(reason); ++*/ + } + + bool VideoCaptureDeviceMac::UpdateCaptureResolution() { ++/*MAS + if (![capture_device_ setCaptureHeight:capture_format_.frame_size.height() + width:capture_format_.frame_size.width() + frameRate:capture_format_.frame_rate]) { +@@ -332,6 +356,8 @@ bool VideoCaptureDeviceMac::UpdateCaptureResolution() { + return false; + } + return true; ++*/ ++ return false;//MAS + } + + } // namespace media +diff --git a/media/video/capture/mac/video_capture_device_qtkit_mac.h b/media/video/capture/mac/video_capture_device_qtkit_mac.h +index 1eba8a1..a3493b9 100644 +--- a/media/video/capture/mac/video_capture_device_qtkit_mac.h ++++ b/media/video/capture/mac/video_capture_device_qtkit_mac.h +@@ -5,6 +5,7 @@ + // VideoCaptureDeviceQTKit implements all QTKit related code for + // communicating with a QTKit capture device. + ++/*MAS + #ifndef MEDIA_VIDEO_CAPTURE_MAC_VIDEO_CAPTURE_DEVICE_QTKIT_MAC_H_ + #define MEDIA_VIDEO_CAPTURE_MAC_VIDEO_CAPTURE_DEVICE_QTKIT_MAC_H_ + +@@ -66,3 +67,4 @@ class VideoCaptureDeviceMac; + @end + + #endif // MEDIA_VIDEO_CAPTURE_MAC_VIDEO_CAPTURE_DEVICE_QTKIT_MAC_H_ ++*/ +diff --git a/media/video/capture/mac/video_capture_device_qtkit_mac.mm b/media/video/capture/mac/video_capture_device_qtkit_mac.mm +index a4bf71d..ad15ee0 100644 +--- a/media/video/capture/mac/video_capture_device_qtkit_mac.mm ++++ b/media/video/capture/mac/video_capture_device_qtkit_mac.mm +@@ -1,7 +1,7 @@ + // Copyright (c) 2012 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. +- ++/*MAS + #import "media/video/capture/mac/video_capture_device_qtkit_mac.h" + + #import +@@ -313,3 +313,4 @@ + } + + @end ++*/ +diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc +index 0644d4d..96d14dc 100644 +--- a/net/dns/dns_config_service_posix.cc ++++ b/net/dns/dns_config_service_posix.cc +@@ -97,10 +97,13 @@ class DnsConfigWatcher { + typedef base::Callback CallbackType; + + bool Watch(const CallbackType& callback) { ++ /*MAS + callback_ = callback; + return watcher_.Watch(base::FilePath(kFilePathConfig), false, + base::Bind(&DnsConfigWatcher::OnCallback, + base::Unretained(this))); ++ */ ++ return false;//MAS + } + + private: +@@ -216,6 +219,7 @@ class DnsConfigServicePosix::Watcher { + DNS_CONFIG_WATCH_FAILED_TO_START_CONFIG, + DNS_CONFIG_WATCH_MAX); + } ++ /*MAS + if (!hosts_watcher_.Watch(base::FilePath(kFilePathHosts), false, + base::Bind(&Watcher::OnHostsChanged, + base::Unretained(this)))) { +@@ -225,6 +229,7 @@ class DnsConfigServicePosix::Watcher { + DNS_CONFIG_WATCH_FAILED_TO_START_HOSTS, + DNS_CONFIG_WATCH_MAX); + } ++ */ + return success; + } + +diff --git a/ui/shell_dialogs/select_file_dialog_mac.mm b/ui/shell_dialogs/select_file_dialog_mac.mm +index b02d46e..e09a941 100644 +--- a/ui/shell_dialogs/select_file_dialog_mac.mm ++++ b/ui/shell_dialogs/select_file_dialog_mac.mm +@@ -416,7 +416,7 @@ bool SelectFileDialogImpl::HasMultipleFileTypeChoicesImpl() { + index = 1; + } + } else { +- CHECK([panel isKindOfClass:[NSOpenPanel class]]); ++ //CHECK([panel isKindOfClass:[NSOpenPanel class]]);MAS + NSArray* urls = [static_cast(panel) URLs]; + for (NSURL* url in urls) + if ([url isFileURL])